Date: Fri, 15 Jul 2005 02:34:45 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 80231 for review Message-ID: <200507150234.j6F2YjBu051443@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=80231 Change 80231 by peter@peter_overcee on 2005/07/15 02:33:59 IFC @80227 Affected files ... .. //depot/projects/hammer/contrib/pf/man/pflog.4#5 integrate .. //depot/projects/hammer/contrib/pf/man/pfsync.4#6 integrate .. //depot/projects/hammer/contrib/pf/pfctl/pfctl.8#4 integrate .. //depot/projects/hammer/etc/etc.powerpc/ttys#2 integrate .. //depot/projects/hammer/lib/Makefile#50 integrate .. //depot/projects/hammer/lib/libc/gen/sem_init.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/sem_post.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/sem_wait.3#3 integrate .. //depot/projects/hammer/lib/libcam/camlib.c#3 integrate .. //depot/projects/hammer/lib/libmemstat/Makefile#1 branch .. //depot/projects/hammer/lib/libmemstat/libmemstat.3#1 branch .. //depot/projects/hammer/lib/libmemstat/memstat.c#1 branch .. //depot/projects/hammer/lib/libmemstat/memstat.h#1 branch .. //depot/projects/hammer/lib/libmemstat/memstat_all.c#1 branch .. //depot/projects/hammer/lib/libmemstat/memstat_internal.h#1 branch .. //depot/projects/hammer/lib/libmemstat/memstat_malloc.c#1 branch .. //depot/projects/hammer/lib/libmemstat/memstat_uma.c#1 branch .. //depot/projects/hammer/lib/libpmc/pmc.3#5 integrate .. //depot/projects/hammer/sbin/devd/devd.cc#13 integrate .. //depot/projects/hammer/sbin/geom/class/raid3/geom_raid3.c#11 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#26 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#26 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.h#10 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#13 integrate .. //depot/projects/hammer/sbin/startslip/startslip.1#4 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.8#10 integrate .. //depot/projects/hammer/share/man/man4/Makefile#73 integrate .. //depot/projects/hammer/share/man/man4/agp.4#5 integrate .. //depot/projects/hammer/share/man/man4/awi.4#8 integrate .. //depot/projects/hammer/share/man/man4/if_bridge.4#4 integrate .. //depot/projects/hammer/share/man/man4/kbdmux.4#1 branch .. //depot/projects/hammer/share/man/man4/witness.4#7 integrate .. //depot/projects/hammer/share/man/man7/development.7#7 integrate .. //depot/projects/hammer/share/man/man7/firewall.7#11 integrate .. //depot/projects/hammer/share/man/man7/ports.7#14 integrate .. //depot/projects/hammer/share/man/man7/security.7#12 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC#29 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_proto.h#13 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_syscall.h#13 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_sysent.c#13 integrate .. //depot/projects/hammer/sys/alpha/linux/syscalls.master#13 integrate .. //depot/projects/hammer/sys/alpha/osf1/Makefile#2 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_proto.h#8 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_syscall.h#8 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_sysent.c#8 integrate .. //depot/projects/hammer/sys/alpha/osf1/syscalls.master#8 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#75 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#46 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_proto.h#5 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_syscall.h#5 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysent.c#5 integrate .. //depot/projects/hammer/sys/amd64/linux32/syscalls.master#5 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/Makefile#15 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/libi386.h#9 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/hammer/sys/boot/i386/loader/main.c#9 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#31 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#30 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#28 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#28 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#28 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#32 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4.h#4 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_proto.h#6 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_stream.c#16 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_syscall.h#6 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_syscallnames.c#6 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sysent.c#6 integrate .. //depot/projects/hammer/sys/compat/svr4/syscalls.master#6 integrate .. //depot/projects/hammer/sys/conf/NOTES#94 integrate .. //depot/projects/hammer/sys/conf/files#117 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#16 integrate .. //depot/projects/hammer/sys/dev/aac/aac_pci.c#22 integrate .. //depot/projects/hammer/sys/dev/advansys/adv_isa.c#10 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#25 integrate .. //depot/projects/hammer/sys/dev/ep/if_epvar.h#10 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex_pccard.c#10 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_ppro.c#6 integrate .. //depot/projects/hammer/sys/dev/kbd/kbd.c#11 integrate .. //depot/projects/hammer/sys/dev/kbd/kbdreg.h#4 integrate .. //depot/projects/hammer/sys/dev/kbdmux/kbdmux.c#1 branch .. //depot/projects/hammer/sys/dev/pccard/pccard.c#26 integrate .. //depot/projects/hammer/sys/dev/pccard/pccard_cis.c#13 integrate .. //depot/projects/hammer/sys/dev/pccard/pccard_cis.h#4 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#36 integrate .. //depot/projects/hammer/sys/dev/pccard/pccardvar.h#16 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#33 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbbvar.h#9 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn_pccard.c#11 integrate .. //depot/projects/hammer/sys/dev/sn/ositech.h#1 branch .. //depot/projects/hammer/sys/dev/sound/isa/mss.c#13 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#32 integrate .. //depot/projects/hammer/sys/dev/usb/sl811hs.c#1 branch .. //depot/projects/hammer/sys/dev/usb/sl811hsreg.h#1 branch .. //depot/projects/hammer/sys/dev/usb/sl811hsvar.h#1 branch .. //depot/projects/hammer/sys/dev/usb/slhci_pccard.c#1 branch .. //depot/projects/hammer/sys/dev/usb/usb.c#16 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe.c#22 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe_pccard.c#17 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_devs.c#12 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#35 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#38 integrate .. //depot/projects/hammer/sys/i386/i386/exception.s#11 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#63 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#38 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_isc_syscall.h#5 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_isc_sysent.c#6 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_proto.h#7 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_syscall.h#7 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysent.c#9 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix.h#5 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix_syscall.h#5 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix_sysent.c#6 integrate .. //depot/projects/hammer/sys/i386/ibcs2/syscalls.isc#5 integrate .. //depot/projects/hammer/sys/i386/ibcs2/syscalls.master#7 integrate .. //depot/projects/hammer/sys/i386/ibcs2/syscalls.xenix#5 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#28 integrate .. //depot/projects/hammer/sys/i386/linux/linux_proto.h#16 integrate .. //depot/projects/hammer/sys/i386/linux/linux_syscall.h#16 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysent.c#17 integrate .. //depot/projects/hammer/sys/i386/linux/syscalls.master#16 integrate .. //depot/projects/hammer/sys/i386/pci/pci_pir.c#9 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC#21 integrate .. //depot/projects/hammer/sys/kern/Makefile#3 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#33 integrate .. //depot/projects/hammer/sys/kern/kern_mac.c#33 integrate .. //depot/projects/hammer/sys/kern/kern_malloc.c#25 integrate .. //depot/projects/hammer/sys/kern/tty_pty.c#28 integrate .. //depot/projects/hammer/sys/modules/Makefile#83 integrate .. //depot/projects/hammer/sys/modules/ed/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/ep/Makefile#7 integrate .. //depot/projects/hammer/sys/modules/kbdmux/Makefile#1 branch .. //depot/projects/hammer/sys/modules/slhci/Makefile#1 branch .. //depot/projects/hammer/sys/net/if.c#50 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#6 integrate .. //depot/projects/hammer/sys/netinet/in_proto.c#16 integrate .. //depot/projects/hammer/sys/nfs/nfs_common.c#7 integrate .. //depot/projects/hammer/sys/nfs/nfs_common.h#5 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#27 integrate .. //depot/projects/hammer/sys/pc98/cbus/clock.c#4 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#33 integrate .. //depot/projects/hammer/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#52 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#23 integrate .. //depot/projects/hammer/sys/security/mac/mac_vfs.c#8 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#35 integrate .. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#24 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#34 integrate .. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#17 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#35 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#40 integrate .. //depot/projects/hammer/sys/sys/cdefs.h#20 integrate .. //depot/projects/hammer/sys/sys/conf.h#33 integrate .. //depot/projects/hammer/sys/sys/kbio.h#2 integrate .. //depot/projects/hammer/sys/sys/mac.h#27 integrate .. //depot/projects/hammer/sys/sys/mac_policy.h#29 integrate .. //depot/projects/hammer/sys/sys/malloc.h#11 integrate .. //depot/projects/hammer/sys/vm/uma.h#11 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#40 integrate .. //depot/projects/hammer/sys/vm/uma_int.h#18 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#31 integrate .. //depot/projects/hammer/tools/tools/nanobsd/i386.diskimage#13 integrate .. //depot/projects/hammer/usr.bin/ee/ee.1#5 integrate .. //depot/projects/hammer/usr.bin/enigma/enigma.1#5 integrate .. //depot/projects/hammer/usr.bin/env/envopts.c#3 integrate .. //depot/projects/hammer/usr.bin/netstat/if.c#8 integrate .. //depot/projects/hammer/usr.bin/netstat/main.c#13 integrate .. //depot/projects/hammer/usr.bin/netstat/netstat.h#9 integrate .. //depot/projects/hammer/usr.bin/rsh/rsh.1#4 integrate .. //depot/projects/hammer/usr.bin/tip/tip/tip.1#4 integrate .. //depot/projects/hammer/usr.bin/uuencode/uuencode.1#6 integrate .. //depot/projects/hammer/usr.sbin/burncd/burncd.8#13 integrate .. //depot/projects/hammer/usr.sbin/kbdcontrol/kbdcontrol.1#5 integrate .. //depot/projects/hammer/usr.sbin/kbdcontrol/kbdcontrol.c#4 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.8#5 integrate .. //depot/projects/hammer/usr.sbin/tcpdrop/tcpdrop.8#3 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_cli/wpa_cli.8#3 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#4 integrate Differences ... ==== //depot/projects/hammer/contrib/pf/man/pflog.4#5 (text+ko) ==== @@ -23,7 +23,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. .\" -.\" $FreeBSD: src/contrib/pf/man/pflog.4,v 1.4 2005/05/03 16:55:20 mlaier Exp $ +.\" $FreeBSD: src/contrib/pf/man/pflog.4,v 1.5 2005/07/14 20:29:05 brueffer Exp $ .\" .Dd December 10, 2001 .Dt PFLOG 4 @@ -41,7 +41,7 @@ .Xr pf 4 . Logged packets can easily be monitored in real time by invoking -.Xr tcpdump 8 +.Xr tcpdump 1 on the .Nm interface, or stored to disk using @@ -75,13 +75,13 @@ # tcpdump -n -e -ttt -i pflog0 .Ed .Sh SEE ALSO +.Xr tcpdump 1 .Xr inet 4 , .Xr inet6 4 , .Xr netintro 4 , .Xr pf 4 , .Xr ifconfig 8 , -.Xr pflogd 8 , -.Xr tcpdump 8 +.Xr pflogd 8 .Sh HISTORY The .Nm ==== //depot/projects/hammer/contrib/pf/man/pfsync.4#6 (text+ko) ==== @@ -24,7 +24,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. .\" -.\" $FreeBSD: src/contrib/pf/man/pfsync.4,v 1.5 2005/05/03 16:55:20 mlaier Exp $ +.\" $FreeBSD: src/contrib/pf/man/pfsync.4,v 1.6 2005/07/14 20:29:05 brueffer Exp $ .\" .Dd February 23, 2005 .Dt PFSYNC 4 @@ -210,7 +210,7 @@ .Ed .Sh BUGS Possibility to view state changes using -.Xr tcpdump 8 +.Xr tcpdump 1 has not been ported from .Ox yet. ==== //depot/projects/hammer/contrib/pf/pfctl/pfctl.8#4 (text+ko) ==== @@ -24,6 +24,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" +.\" $FreeBSD: src/contrib/pf/pfctl/pfctl.8,v 1.2 2005/07/14 20:29:05 brueffer Exp $ +.\" .Dd November 20, 2002 .Dt PFCTL 8 .Os @@ -83,7 +85,7 @@ is set to .Dv YES in -.Xr rc.conf.local 8 , +.Xr rc.conf.local 5 , the rule file specified with the variable .Va pf_rules is loaded automatically by the @@ -594,11 +596,11 @@ .Xr pf 4 , .Xr pf.conf 5 , .Xr pf.os 5 , +.Xr rc.conf 5 , .Xr sysctl.conf 5 , .Xr authpf 8 , .Xr ftp-proxy 8 , .Xr rc 8 , -.Xr rc.conf 8 , .Xr sysctl 8 .Sh HISTORY The ==== //depot/projects/hammer/etc/etc.powerpc/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.1 2004/02/04 01:44:34 grehan Exp $ +# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.2 2005/07/14 07:08:49 grehan Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -32,9 +32,11 @@ # when going to single-user mode. console none unknown off secure # +# ofw_console(4) screen "/usr/libexec/getty Pc" cons25 on secure -ttya "/usr/libexec/getty 3wire.9600" cons25 on secure -ttyb "/usr/libexec/getty 3wire.9600" cons25 off secure +# zs(4) +ttyy0 "/usr/libexec/getty std.9600" cons25 on secure +ttyy1 "/usr/libexec/getty std.9600" cons25 off secure # ttyv0 "/usr/libexec/getty Pc" cons25 on secure # Virtual terminals ==== //depot/projects/hammer/lib/Makefile#50 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.205 2005/04/20 20:50:32 marcel Exp $ +# $FreeBSD: src/lib/Makefile,v 1.206 2005/07/14 17:59:50 rwatson Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -29,7 +29,7 @@ libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \ libedit libexpat libfetch libform libftpio libgeom ${_libgpib} \ ${_libio} libipsec \ - libipx libkiconv libmagic libmenu ${_libmilter} ${_libmp} \ + libipx libkiconv libmagic libmemstat libmenu ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpanel libpcap \ libpmc ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ ==== //depot/projects/hammer/lib/libc/gen/sem_init.3#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/sem_init.3,v 1.17 2004/07/02 16:45:56 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/sem_init.3,v 1.18 2005/07/13 13:15:21 rwatson Exp $ .\" .Dd February 15, 2000 .Dt SEM_INIT 3 @@ -83,6 +83,7 @@ .El .Sh SEE ALSO .Xr sem_destroy 3 , +.Xr sem_getvalue 3 , .Xr sem_post 3 , .Xr sem_trywait 3 , .Xr sem_wait 3 , ==== //depot/projects/hammer/lib/libc/gen/sem_post.3#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/sem_post.3,v 1.14 2004/07/02 16:45:56 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/sem_post.3,v 1.15 2005/07/13 13:15:21 rwatson Exp $ .\" .Dd February 15, 2000 .Dt SEM_POST 3 @@ -67,6 +67,7 @@ points to an invalid semaphore. .El .Sh SEE ALSO +.Xr sem_getvalue 3 , .Xr sem_trywait 3 , .Xr sem_wait 3 , .Xr sem 4 ==== //depot/projects/hammer/lib/libc/gen/sem_wait.3#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/sem_wait.3,v 1.12 2004/07/02 16:45:56 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/sem_wait.3,v 1.13 2005/07/13 13:15:22 rwatson Exp $ .\" .Dd February 15, 2000 .Dt SEM_WAIT 3 @@ -82,6 +82,7 @@ The semaphore value was zero, and thus could not be decremented. .El .Sh SEE ALSO +.Xr sem_getvalue 3 , .Xr sem_post 3 , .Xr sem 4 .Sh STANDARDS ==== //depot/projects/hammer/lib/libcam/camlib.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libcam/camlib.c,v 1.12 2004/07/29 15:35:45 scottl Exp $"); +__FBSDID("$FreeBSD: src/lib/libcam/camlib.c,v 1.13 2005/07/13 10:40:07 delphij Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -97,8 +97,7 @@ void cam_freeccb(union ccb *ccb) { - if (ccb != NULL) - free(ccb); + free(ccb); } /* @@ -708,8 +707,7 @@ cam_close_spec_device(dev); - if (dev != NULL) - free(dev); + free(dev); } void @@ -757,6 +755,11 @@ } newdev = malloc(sizeof(struct cam_device)); + if (newdev == NULL) { + snprintf(cam_errbuf, CAM_ERRBUF_SIZE, + "%s: couldn't malloc CAM device structure", func_name); + return(NULL); + } bcopy(device, newdev, sizeof(struct cam_device)); ==== //depot/projects/hammer/lib/libpmc/pmc.3#5 (text+ko) ==== @@ -21,7 +21,7 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.5 2005/06/24 16:56:24 ru Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.6 2005/07/14 20:29:05 brueffer Exp $ .\" .Dd June 24, 2005 .Os @@ -3383,7 +3383,6 @@ .Xr pmclog 3 , .Xr hwpmc 4 , .Xr pmccontrol 8 , -.Xr pmcreport 8 , .Xr pmcstat 8 .Sh BUGS The information returned by ==== //depot/projects/hammer/sbin/devd/devd.cc#13 (text+ko) ==== @@ -34,7 +34,7 @@ // - devd.conf needs more details on the supported statements. #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/devd/devd.cc,v 1.22 2005/07/10 03:37:15 imp Exp $"); +__FBSDID("$FreeBSD: src/sbin/devd/devd.cc,v 1.24 2005/07/13 17:28:11 marcus Exp $"); #include <sys/param.h> #include <sys/socket.h> @@ -672,11 +672,13 @@ strlcpy(sun.sun_path, name, sizeof(sun.sun_path)); slen = SUN_LEN(&sun); unlink(name); + if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0) + err(1, "fcntl"); if (bind(fd, (struct sockaddr *) & sun, slen) < 0) err(1, "bind"); listen(fd, 4); - fchown(fd, 0, 0); /* XXX - root.wheel */ - fchmod(fd, 0660); + chown(name, 0, 0); /* XXX - root.wheel */ + chmod(name, 0666); return (fd); } ==== //depot/projects/hammer/sbin/geom/class/raid3/geom_raid3.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/geom/class/raid3/geom_raid3.c,v 1.11 2005/03/14 14:25:47 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/raid3/geom_raid3.c,v 1.12 2005/07/13 07:46:55 pjd Exp $"); #include <sys/param.h> #include <errno.h> @@ -173,6 +173,7 @@ return; } strlcpy(md.md_name, str, sizeof(md.md_name)); + md.md_id = arc4random(); md.md_all = *nargs - 1; md.md_mflags = 0; md.md_dflags = 0; ==== //depot/projects/hammer/sbin/ifconfig/ifconfig.8#26 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.95 2005/07/06 15:39:11 sam Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.98 2005/07/14 18:33:21 rwatson Exp $ .\" -.Dd July 5, 2005 +.Dd July 11, 2005 .Dt IFCONFIG 8 .Os .Sh NAME @@ -37,6 +37,7 @@ .Sh SYNOPSIS .Nm .Op Fl L +.Op Fl k .Op Fl m .Ar interface .Op Cm create @@ -65,6 +66,7 @@ .Nm .Op Fl L .Op Fl d +.Op Fl k .Op Fl m .Op Fl u .Op Fl v @@ -751,6 +753,34 @@ .It Cm scan Display the current set of scanned neighbors and/or trigger a new scan. Only the super-user can trigger a scan. +Depending on the capabilities of the APs, the following +flags can be included in the output: +.Bl -tag -width 3n +.It Li E +Extended Service Set (ESS). +Indicates that the station is part of an infrastructure network +(in contrast to an IBSS/ad-hoc network). +.It Li I +IBSS/ad-hoc network. +Indicates that the station is part of an ad-hoc network +(in contrast to an ESS network). +.It Li P +Privacy. +Data confidentiality is required for all data type frames +exchanged within the BSS. +This means that this BSS requires the station to +use cryptographic means such as WEP, TKIP or AES-CCMP to +encrypt/decrypt data frames being exchanged with others. +.It Li S +Short Preamble. +Indicates that the network is using short preambles (defined +in 802.11b High Rate/DSSS PHY, short preamble utilizes a +56 bit sync field in contrast to a 128 bit field used in long +preamble mode). +.It Li s +Short slot time. +Indicates that the network supports short slot time. +.El .It Cm stationname Ar name Set the name of this station. It appears that the station name is not really part of the IEEE 802.11 @@ -1043,6 +1073,15 @@ the system, with no additional information. Use of this flag is mutually exclusive with all other flags and commands. .Pp +The +.Fl k +flag causes keying information for the interface, if available, to be +printed. +For example, the values of 802.11 WEP keys will be printed, if accessible to +the current user. +This information is not printed by default, as it may be considered +sensitive. +.Pp Only the super-user may modify the configuration of a network interface. .Sh NOTES The media selection system is relatively new and only some drivers support ==== //depot/projects/hammer/sbin/ifconfig/ifconfig.c#26 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.113 2005/05/20 03:58:53 sam Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.115 2005/07/14 18:33:21 rwatson Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -91,6 +91,7 @@ int verbose; int supmedia = 0; +int printkeys = 0; /* Print keying material for interfaces. */ int printname = 0; /* Print the name of the created interface. */ static int ifconfig(int argc, char *const *argv, const struct afswtch *afp); @@ -156,7 +157,7 @@ all = downonly = uponly = namesonly = verbose = 0; /* Parse leading line options */ - strlcpy(options, "adlmuv", sizeof(options)); + strlcpy(options, "adklmuv", sizeof(options)); for (p = opts; p != NULL; p = p->next) strlcat(options, p->opt, sizeof(options)); while ((c = getopt(argc, argv, options)) != -1) { @@ -167,6 +168,9 @@ case 'd': /* restrict scan to "down" interfaces */ downonly++; break; + case 'k': + printkeys++; + break; case 'l': /* scan interface names only */ namesonly++; break; @@ -809,7 +813,7 @@ #define IFFBITS \ "\020\1UP\2BROADCAST\3DEBUG\4LOOPBACK\5POINTOPOINT\6SMART\7RUNNING" \ "\10NOARP\11PROMISC\12ALLMULTI\13OACTIVE\14SIMPLEX\15LINK0\16LINK1\17LINK2" \ -"\20MULTICAST\21POLLING\23MONITOR\24STATICARP" +"\20MULTICAST\21POLLING\22PPROMISC\23MONITOR\24STATICARP\25NEEDSGIANT" #define IFCAPBITS \ "\020\1RXCSUM\2TXCSUM\3NETCONS\4VLAN_MTU\5VLAN_HWTAGGING\6JUMBO_MTU\7POLLING" ==== //depot/projects/hammer/sbin/ifconfig/ifconfig.h#10 (text+ko) ==== @@ -31,7 +31,7 @@ * * so there! * - * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.16 2005/04/08 21:37:41 stefanf Exp $ + * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.17 2005/07/14 18:33:21 rwatson Exp $ */ #define __constructor __attribute__((constructor)) @@ -126,6 +126,7 @@ extern char name[IFNAMSIZ]; /* name of interface */ extern int allmedia; extern int supmedia; +extern int printkeys; extern int printname; extern int flags; extern int newaddr; ==== //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#13 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.18 2005/07/06 15:39:11 sam Exp $ + * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.19 2005/07/14 18:33:21 rwatson Exp $ */ /*- @@ -1224,7 +1224,7 @@ int keylen = ik->ik_keylen; int printcontents; - printcontents = + printcontents = printkeys && (memcmp(ik->ik_keydata, zerodata, keylen) != 0 || verbose); if (printcontents) LINE_BREAK(); ==== //depot/projects/hammer/sbin/startslip/startslip.1#4 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)startslip.1 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/sbin/startslip/startslip.1,v 1.23 2004/07/02 21:45:05 ru Exp $ +.\" $FreeBSD: src/sbin/startslip/startslip.1,v 1.24 2005/07/14 20:29:05 brueffer Exp $ .\" .Dd June 5, 1993 .Dt STARTSLIP 1 @@ -203,7 +203,7 @@ .It Pa /usr/share/examples/startslip/* .El .Sh SEE ALSO -.Xr uustat 1 , +.Xr uustat 1 Pq Pa ports/net/freebsd-uucp , .Xr slattach 8 , .Xr sliplogin 8 .Sh HISTORY ==== //depot/projects/hammer/sbin/sysctl/sysctl.8#10 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)sysctl.8 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/sbin/sysctl/sysctl.8,v 1.57 2005/01/18 10:09:38 ru Exp $ +.\" $FreeBSD: src/sbin/sysctl/sysctl.8,v 1.58 2005/07/14 20:29:06 brueffer Exp $ .\" .Dd March 10, 2002 .Dt SYSCTL 8 @@ -87,7 +87,7 @@ This is particularly useful with shells that offer programmable completion. To enable completion of variable names in -.Xr zsh 1 , +.Xr zsh 1 Pq Pa ports/shells/zsh , use the following code: .Bd -literal -offset indent listsysctls () { set -A reply $(sysctl -AN ${1%.*}) } ==== //depot/projects/hammer/share/man/man4/Makefile#73 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.320 2005/06/10 08:44:19 glebius Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.322 2005/07/14 23:04:22 emax Exp $ MAN= aac.4 \ acpi.4 \ @@ -122,6 +122,7 @@ ixgb.4 \ joy.4 \ kame.4 \ + kbdmux.4 \ keyboard.4 \ kld.4 \ ktr.4 \ @@ -405,6 +406,7 @@ MLINKS+=fd.4 stderr.4 \ fd.4 stdin.4 \ fd.4 stdout.4 +MLINKS+=firewire.4 ieee1394.4 MLINKS+=fpa.4 fea.4 MLINKS+=fwe.4 if_fwe.4 MLINKS+=fwip.4 if_fwip.4 ==== //depot/projects/hammer/share/man/man4/agp.4#5 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/agp.4,v 1.6 2003/09/08 19:57:19 ru Exp $ +.\" $FreeBSD: src/share/man/man4/agp.4,v 1.7 2005/07/14 20:29:06 brueffer Exp $ .\" .Dd October 5, 2001 .Dt AGP 4 @@ -163,7 +163,7 @@ AGP device node. .El .Sh SEE ALSO -.Xr XFree86 1 +.Xr X 7 Pq Pa ports/x11/xorg .Sh HISTORY The .Nm ==== //depot/projects/hammer/share/man/man4/awi.4#8 (text+ko) ==== @@ -1,5 +1,5 @@ .\" $NetBSD: awi.4,v 1.6 2000/03/22 11:24:33 onoe Exp $ -.\" $FreeBSD: src/share/man/man4/awi.4,v 1.18 2005/02/13 22:25:17 ru Exp $ +.\" $FreeBSD: src/share/man/man4/awi.4,v 1.19 2005/07/14 20:29:06 brueffer Exp $ .\" .Dd October 31, 1999 .Dt AWI 4 @@ -41,7 +41,7 @@ .Nm driver also supports a variant of adhoc mode out of spec for DS radio cards, which makes it possible to communicate with adhoc mode of -.Xr wi 8 +.Xr wi 4 driver. The NWID does not affect in this mode. .Pp ==== //depot/projects/hammer/share/man/man4/if_bridge.4#4 (text+ko) ==== @@ -33,7 +33,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/if_bridge.4,v 1.5 2005/06/27 10:58:22 thompsa Exp $ +.\" $FreeBSD: src/share/man/man4/if_bridge.4,v 1.6 2005/07/13 20:40:19 thompsa Exp $ .\" .Dd June 10, 2005 .Dt IF_BRIDGE 4 @@ -133,6 +133,9 @@ Note that packets to and from the bridging host will be seen by the filter on the interface with the appropriate address configured as well as on the interface on which the packet arrives or departs. +.Pp +The MTU of the first member interface to be added is used as the bridge MTU, +all additional members are required to have exactly the same value. .Sh EXAMPLES The following when placed in the file .Pa /etc/rc.conf ==== //depot/projects/hammer/share/man/man4/witness.4#7 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/witness.4,v 1.9 2005/06/15 13:31:22 ru Exp $ +.\" $FreeBSD: src/share/man/man4/witness.4,v 1.10 2005/07/13 21:12:06 yar Exp $ .\" .Dd February 18, 2001 .Dt WITNESS 4 @@ -98,6 +98,7 @@ A value of 0 specifies that witness is disabled. This sysctl can be written to in order to disable witness, however it may not be used to enable witness. +The sysctl .Va debug.witness.watch can be set via .Xr loader 8 . @@ -124,6 +125,8 @@ .El .Sh SEE ALSO .Xr ddb 4 , +.Xr loader 8 , +.Xr sysctl 8 , .Xr mutex 9 .Sh HISTORY The ==== //depot/projects/hammer/share/man/man7/development.7#7 (text+ko) ==== @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/development.7,v 1.14 2005/01/15 11:12:40 ru Exp $ +.\" $FreeBSD: src/share/man/man7/development.7,v 1.15 2005/07/14 20:29:06 brueffer Exp $ .\" .Dd December 21, 2002 .Dt DEVELOPMENT 7 @@ -89,7 +89,7 @@ partition of at least 5GB. .Pp On the master server, use -.Xr cvsup 1 +.Xr cvsup 1 Pq Pa ports/net/cvsup to automatically pull down and maintain the .Fx ==== //depot/projects/hammer/share/man/man7/firewall.7#11 (text+ko) ==== @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/firewall.7,v 1.25 2005/02/13 23:45:50 ru Exp $ +.\" $FreeBSD: src/share/man/man7/firewall.7,v 1.26 2005/07/14 20:29:06 brueffer Exp $ .\" .Dd May 26, 2001 .Dt FIREWALL 7 @@ -410,7 +410,6 @@ .Xr jail 8 to indirectly bind services that do not otherwise give you the option. .Sh SEE ALSO -.Xr ipnat 1 , .Xr dummynet 4 , .Xr ipnat 5 , .Xr rc.conf 5 , @@ -418,6 +417,7 @@ .Xr samba 7 Pq Pa ports/net/samba , .Xr config 8 , .Xr ipfw 8 , +.Xr ipnat 8 , .Xr jail 8 , .Xr natd 8 , .Xr nfsd 8 ==== //depot/projects/hammer/share/man/man7/ports.7#14 (text+ko) ==== @@ -23,7 +23,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. .\" -.\" $FreeBSD: src/share/man/man7/ports.7,v 1.50 2005/02/07 23:04:33 krion Exp $ +.\" $FreeBSD: src/share/man/man7/ports.7,v 1.51 2005/07/14 20:29:06 brueffer Exp $ .\" .Dd February 8, 2005 .Dt PORTS 7 @@ -66,7 +66,7 @@ .Pa http://www.FreeBSD.org/ports/ first! The -.Xr portcheckout 1 +.Xr portcheckout 1 Pq Pa ports/devel/portcheckout script (also a port, of course!) will help to download new ports. .Pp For more information about using ports, see @@ -443,7 +443,7 @@ variables. .It Va DISABLE_VULNERABILITIES If defined, disable check for security vulnerabilities using -.Xr portaudit 1 +.Xr portaudit 1 Pq Pa ports/security/portaudit when installing new ports. .El .Sh FILES @@ -470,6 +470,7 @@ The following are part of the ports collection: .Pp .Xr pib 1 , +.Xr portaudit 1 , .Xr portcheckout 1 , .Xr portlint 1 .Rs ==== //depot/projects/hammer/share/man/man7/security.7#12 (text+ko) ==== @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/security.7,v 1.41 2005/01/21 12:01:00 ru Exp $ +.\" $FreeBSD: src/share/man/man7/security.7,v 1.42 2005/07/14 20:29:06 brueffer Exp $ .\" .Dd November 29, 2004 .Dt SECURITY 7 @@ -326,7 +326,7 @@ running an old version of .Xr imapd 8 or -.Xr popper 8 +.Xr popper 8 Pq Pa ports/mail/popper is like giving a universal root ticket out to the entire world. Never run a server that you have not checked @@ -404,7 +404,7 @@ Still, root holes are occasionally found in these binaries. A root hole was found in Xlib in 1998 that made -.Xr xterm 1 +.Xr xterm 1 Pq Pa ports/x11/xterm (which is typically SUID) vulnerable. It is better to be safe than sorry and the prudent sysadmin will restrict SUID @@ -945,7 +945,7 @@ .Xr netstat 1 , .Xr openssl 1 , .Xr ssh 1 , -.Xr xdm 1 , +.Xr xdm 1 Pq Pa ports/x11/xorg-clients , .Xr group 5 , .Xr ttys 5 , .Xr accton 8 , ==== //depot/projects/hammer/sys/alpha/conf/GENERIC#29 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.186 2005/06/06 10:53:10 wilko Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.187 2005/07/14 15:39:04 kensmith Exp $ machine alpha cpu EV4 @@ -63,6 +63,7 @@ options GEOM_GPT # GUID Partition Tables. options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 # Compatible with FreeBSD4 +options COMPAT_FREEBSD5 # Compatible with FreeBSD5 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options SYSVSHM # SYSV-style shared memory ==== //depot/projects/hammer/sys/alpha/linux/linux_proto.h#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.22 2005/06/08 20:47:30 sobomax Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.63 2005/06/08 20:41:27 sobomax Exp + * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.23 2005/07/13 20:35:07 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/hammer/sys/alpha/linux/linux_syscall.h#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.20 2005/06/08 20:47:30 sobomax Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.63 2005/06/08 20:41:27 sobomax Exp + * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.21 2005/07/13 20:35:07 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/hammer/sys/alpha/linux/linux_sysent.c#13 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507150234.j6F2YjBu051443>