From owner-p4-projects@FreeBSD.ORG Sat Nov 14 19:48:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D72A1065676; Sat, 14 Nov 2009 19:48:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D51F71065670 for ; Sat, 14 Nov 2009 19:48:46 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C13208FC14 for ; Sat, 14 Nov 2009 19:48:46 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAEJmkel086657 for ; Sat, 14 Nov 2009 19:48:46 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAEJmk4l086655 for perforce@freebsd.org; Sat, 14 Nov 2009 19:48:46 GMT (envelope-from mav@freebsd.org) Date: Sat, 14 Nov 2009 19:48:46 GMT Message-Id: <200911141948.nAEJmk4l086655@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170625 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Nov 2009 19:48:47 -0000 http://p4web.freebsd.org/chv.cgi?CH=170625 Change 170625 by mav@mav_mavbook on 2009/11/14 19:48:04 IFC Affected files ... .. //depot/projects/scottl-camlock/src/UPDATING#22 integrate .. //depot/projects/scottl-camlock/src/bin/sh/trap.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/libpcap/inet.c#3 integrate .. //depot/projects/scottl-camlock/src/etc/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/etc/etc.amd64/ttys#4 integrate .. //depot/projects/scottl-camlock/src/etc/etc.arm/ttys#4 integrate .. //depot/projects/scottl-camlock/src/etc/etc.i386/ttys#4 integrate .. //depot/projects/scottl-camlock/src/etc/etc.ia64/ttys#4 integrate .. //depot/projects/scottl-camlock/src/etc/etc.mips/ttys#3 integrate .. //depot/projects/scottl-camlock/src/etc/etc.powerpc/ttys#4 integrate .. //depot/projects/scottl-camlock/src/etc/etc.sparc64/ttys#4 integrate .. //depot/projects/scottl-camlock/src/etc/root/dot.profile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/locale/isgraph.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/locale/isprint.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/net/getnameinfo.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/net/ip6opt.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/nls/nl_NL.ISO8859-1.msg#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.c#6 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/vfork.2#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_unix/pam_unix.8#3 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/rtld.c#7 integrate .. //depot/projects/scottl-camlock/src/release/picobsd/floppy.tree/etc/ttys#3 integrate .. //depot/projects/scottl-camlock/src/release/picobsd/tinyware/oinit/oinit.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.8#9 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.c#5 integrate .. //depot/projects/scottl-camlock/src/sbin/mount/mount.8#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/netintro.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/snd_hda.4#3 integrate .. //depot/projects/scottl-camlock/src/share/misc/organization.dot#2 integrate .. //depot/projects/scottl-camlock/src/share/skel/dot.profile#3 integrate .. //depot/projects/scottl-camlock/src/share/timedef/ja_JP.SJIS.src#5 integrate .. //depot/projects/scottl-camlock/src/share/timedef/ja_JP.UTF-8.src#5 integrate .. //depot/projects/scottl-camlock/src/share/timedef/ja_JP.eucJP.src#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/initcpu.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#32 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#36 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/md_var.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/Makefile.inc#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/boot.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/glue.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#58 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/boot/zfs/zfssubr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#43 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#55 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#37 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/rdma/krping/krping.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/ahd_pci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ahci.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bwi/if_bwi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bwi/if_bwivar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_ael1002.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_aq100x.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_xgmac.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_main.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dpms/dpms.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/vgareg.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/vga_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/scterm-teken.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clvnops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_gpt.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/cpufreq/est.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/initcpu.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#37 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xen/pmap.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/isa/vga_isa.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#37 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_default.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#32 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.c#37 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_var.h#27 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_action.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_proto.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_proxy.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_fha.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/cbus/cbus_dma.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea64.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#33 integrate .. //depot/projects/scottl-camlock/src/sys/sys/priv.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sockio.h#11 integrate .. //depot/projects/scottl-camlock/src/tools/regression/lib/libutil/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/tools/regression/lib/libutil/test-flopen.c#5 integrate .. //depot/projects/scottl-camlock/src/tools/regression/lib/libutil/test-grp.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/lib/libutil/test-trimdomain-nodomain.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/lib/libutil/test-trimdomain.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/gateworks/Files/root/.profile#2 integrate .. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/rescue/Files/etc/ttys#2 integrate .. //depot/projects/scottl-camlock/src/tools/tools/tinybsd/conf/wrap/etc/ttys#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/gencat/gencat.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/kdump/kdump.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/main.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sade/termcap.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/termcap.c#3 integrate Differences ... ==== //depot/projects/scottl-camlock/src/UPDATING#22 (text+ko) ==== @@ -22,6 +22,21 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20091113: + The default terminal emulation for syscons(4) has been changed + from cons25 to xterm on all platforms except pc98. This means + that the /etc/ttys file needs to be updated to ensure correct + operation of applications on the console. + + The terminal emulation style can be toggled per window by using + vidcontrol(1)'s -T flag. The TEKEN_CONS25 kernel configuration + options can be used to change the compile-time default back to + cons25. + + To prevent graphical artifacts, make sure the TERM environment + variable is set to match the terminal emulation that is being + performed by syscons(4). + 20091109: The layout of the structure ieee80211req_scan_result has changed. Applications that require wireless scan results (e.g. ifconfig(8)) @@ -1057,4 +1072,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.645 2009/11/09 16:05:32 rpaulo Exp $ +$FreeBSD: src/UPDATING,v 1.647 2009/11/13 11:28:54 ed Exp $ ==== //depot/projects/scottl-camlock/src/bin/sh/trap.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.34 2009/06/13 21:10:41 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.35 2009/11/11 23:13:24 jilles Exp $"); #include #include @@ -244,7 +244,8 @@ setsignal(int signo) { int action; - sig_t sig, sigact = SIG_DFL; + sig_t sigact = SIG_DFL; + struct sigaction sa; char *t; if ((t = trap[signo]) == NULL) @@ -320,9 +321,10 @@ case S_IGN: sigact = SIG_IGN; break; } *t = action; - sig = signal(signo, sigact); - if (sig != SIG_ERR && action == S_CATCH) - siginterrupt(signo, 1); + sa.sa_handler = sigact; + sa.sa_flags = 0; + sigemptyset(&sa.sa_mask); + sigaction(signo, &sa, NULL); } ==== //depot/projects/scottl-camlock/src/contrib/libpcap/inet.c#3 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/etc/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.376 2009/09/02 14:54:47 flz Exp $ +# $FreeBSD: src/etc/Makefile,v 1.377 2009/11/13 11:26:44 ed Exp $ .include @@ -18,8 +18,13 @@ rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ rc.sendmail rc.shutdown \ rc.subr remote rpc services shells \ - sysctl.conf syslog.conf \ - etc.${MACHINE_ARCH}/ttys + sysctl.conf syslog.conf + +.if exists(${.CURDIR}/etc.${MACHINE}/ttys) +BIN1+= etc.${MACHINE}/ttys +.else +BIN1+= etc.${MACHINE_ARCH}/ttys +.endif OPENBSMDIR= ${.CURDIR}/../contrib/openbsm BSM_ETC_OPEN_FILES= ${OPENBSMDIR}/etc/audit_class \ ==== //depot/projects/scottl-camlock/src/etc/etc.amd64/ttys#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.amd64/ttys,v 1.18 2009/06/14 22:35:33 ed Exp $ +# $FreeBSD: src/etc/etc.amd64/ttys,v 1.19 2009/11/13 05:54:55 ed Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -15,7 +15,7 @@ # # type The initial terminal type for this port. For hardwired # terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically cons25. +# For virtual consoles, the correct type is typically xterm. # Other common values include network for network connections on # pseudo-terminals, dialup for incoming modem ports, and unknown # when the terminal type cannot be predetermined. @@ -30,15 +30,15 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty Pc" cons25 on secure +ttyv0 "/usr/libexec/getty Pc" xterm on secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" cons25 on secure -ttyv2 "/usr/libexec/getty Pc" cons25 on secure -ttyv3 "/usr/libexec/getty Pc" cons25 on secure -ttyv4 "/usr/libexec/getty Pc" cons25 on secure -ttyv5 "/usr/libexec/getty Pc" cons25 on secure -ttyv6 "/usr/libexec/getty Pc" cons25 on secure -ttyv7 "/usr/libexec/getty Pc" cons25 on secure +ttyv1 "/usr/libexec/getty Pc" xterm on secure +ttyv2 "/usr/libexec/getty Pc" xterm on secure +ttyv3 "/usr/libexec/getty Pc" xterm on secure +ttyv4 "/usr/libexec/getty Pc" xterm on secure +ttyv5 "/usr/libexec/getty Pc" xterm on secure +ttyv6 "/usr/libexec/getty Pc" xterm on secure +ttyv7 "/usr/libexec/getty Pc" xterm on secure ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ==== //depot/projects/scottl-camlock/src/etc/etc.arm/ttys#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.arm/ttys,v 1.11 2009/06/14 22:35:33 ed Exp $ +# $FreeBSD: src/etc/etc.arm/ttys,v 1.12 2009/11/13 05:54:55 ed Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -15,7 +15,7 @@ # # type The initial terminal type for this port. For hardwired # terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically cons25. +# For virtual consoles, the correct type is typically xterm. # Other common values include network for network connections on # pseudo-terminals, dialup for incoming modem ports, and unknown # when the terminal type cannot be predetermined. @@ -30,15 +30,15 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty Pc" cons25 off secure +ttyv0 "/usr/libexec/getty Pc" xterm off secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" cons25 off secure -ttyv2 "/usr/libexec/getty Pc" cons25 off secure -ttyv3 "/usr/libexec/getty Pc" cons25 off secure -ttyv4 "/usr/libexec/getty Pc" cons25 off secure -ttyv5 "/usr/libexec/getty Pc" cons25 off secure -ttyv6 "/usr/libexec/getty Pc" cons25 off secure -ttyv7 "/usr/libexec/getty Pc" cons25 off secure +ttyv1 "/usr/libexec/getty Pc" xterm off secure +ttyv2 "/usr/libexec/getty Pc" xterm off secure +ttyv3 "/usr/libexec/getty Pc" xterm off secure +ttyv4 "/usr/libexec/getty Pc" xterm off secure +ttyv5 "/usr/libexec/getty Pc" xterm off secure +ttyv6 "/usr/libexec/getty Pc" xterm off secure +ttyv7 "/usr/libexec/getty Pc" xterm off secure #ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ==== //depot/projects/scottl-camlock/src/etc/etc.i386/ttys#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.i386/ttys,v 1.18 2009/06/14 22:35:33 ed Exp $ +# $FreeBSD: src/etc/etc.i386/ttys,v 1.19 2009/11/13 11:28:54 ed Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -15,7 +15,7 @@ # # type The initial terminal type for this port. For hardwired # terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically cons25. +# For virtual consoles, the correct type is typically xterm. # Other common values include network for network connections on # pseudo-terminals, dialup for incoming modem ports, and unknown # when the terminal type cannot be predetermined. @@ -30,15 +30,15 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty Pc" cons25 on secure +ttyv0 "/usr/libexec/getty Pc" xterm on secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" cons25 on secure -ttyv2 "/usr/libexec/getty Pc" cons25 on secure -ttyv3 "/usr/libexec/getty Pc" cons25 on secure -ttyv4 "/usr/libexec/getty Pc" cons25 on secure -ttyv5 "/usr/libexec/getty Pc" cons25 on secure -ttyv6 "/usr/libexec/getty Pc" cons25 on secure -ttyv7 "/usr/libexec/getty Pc" cons25 on secure +ttyv1 "/usr/libexec/getty Pc" xterm on secure +ttyv2 "/usr/libexec/getty Pc" xterm on secure +ttyv3 "/usr/libexec/getty Pc" xterm on secure +ttyv4 "/usr/libexec/getty Pc" xterm on secure +ttyv5 "/usr/libexec/getty Pc" xterm on secure +ttyv6 "/usr/libexec/getty Pc" xterm on secure +ttyv7 "/usr/libexec/getty Pc" xterm on secure ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ==== //depot/projects/scottl-camlock/src/etc/etc.ia64/ttys#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.ia64/ttys,v 1.12 2009/06/14 22:35:33 ed Exp $ +# $FreeBSD: src/etc/etc.ia64/ttys,v 1.13 2009/11/13 05:54:55 ed Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -15,7 +15,7 @@ # # type The initial terminal type for this port. For hardwired # terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically cons25. +# For virtual consoles, the correct type is typically xterm. # Other common values include network for network connections on # pseudo-terminals, dialup for incoming modem ports, and unknown # when the terminal type cannot be predetermined. @@ -30,15 +30,15 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty Pc" cons25 off secure -# Virtual terminals. -ttyv1 "/usr/libexec/getty Pc" cons25 off secure -ttyv2 "/usr/libexec/getty Pc" cons25 off secure -ttyv3 "/usr/libexec/getty Pc" cons25 off secure -ttyv4 "/usr/libexec/getty Pc" cons25 off secure -ttyv5 "/usr/libexec/getty Pc" cons25 off secure -ttyv6 "/usr/libexec/getty Pc" cons25 off secure -ttyv7 "/usr/libexec/getty Pc" cons25 off secure +ttyv0 "/usr/libexec/getty Pc" xterm off secure +# Virtual terminals +ttyv1 "/usr/libexec/getty Pc" xterm off secure +ttyv2 "/usr/libexec/getty Pc" xterm off secure +ttyv3 "/usr/libexec/getty Pc" xterm off secure +ttyv4 "/usr/libexec/getty Pc" xterm off secure +ttyv5 "/usr/libexec/getty Pc" xterm off secure +ttyv6 "/usr/libexec/getty Pc" xterm off secure +ttyv7 "/usr/libexec/getty Pc" xterm off secure ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals. The 'dialup' keyword identifies dialin lines to login, # fingerd etc. ==== //depot/projects/scottl-camlock/src/etc/etc.mips/ttys#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.mips/ttys,v 1.6 2009/06/14 22:35:33 ed Exp $ +# $FreeBSD: src/etc/etc.mips/ttys,v 1.7 2009/11/13 05:54:55 ed Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -15,7 +15,7 @@ # # type The initial terminal type for this port. For hardwired # terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically cons25. +# For virtual consoles, the correct type is typically xterm. # Other common values include network for network connections on # pseudo-terminals, dialup for incoming modem ports, and unknown # when the terminal type cannot be predetermined. ==== //depot/projects/scottl-camlock/src/etc/etc.powerpc/ttys#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.11 2009/06/14 22:35:33 ed Exp $ +# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.12 2009/11/13 05:54:55 ed Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -15,7 +15,7 @@ # # type The initial terminal type for this port. For hardwired # terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically cons25. +# For virtual consoles, the correct type is typically xterm. # Other common values include network for network connections on # pseudo-terminals, dialup for incoming modem ports, and unknown # when the terminal type cannot be predetermined. @@ -30,15 +30,15 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty Pc" cons25 on secure +ttyv0 "/usr/libexec/getty Pc" xterm on secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" cons25 on secure -ttyv2 "/usr/libexec/getty Pc" cons25 on secure -ttyv3 "/usr/libexec/getty Pc" cons25 on secure -ttyv4 "/usr/libexec/getty Pc" cons25 on secure -ttyv5 "/usr/libexec/getty Pc" cons25 on secure -ttyv6 "/usr/libexec/getty Pc" cons25 on secure -ttyv7 "/usr/libexec/getty Pc" cons25 on secure +ttyv1 "/usr/libexec/getty Pc" xterm on secure +ttyv2 "/usr/libexec/getty Pc" xterm on secure +ttyv3 "/usr/libexec/getty Pc" xterm on secure +ttyv4 "/usr/libexec/getty Pc" xterm on secure +ttyv5 "/usr/libexec/getty Pc" xterm on secure +ttyv6 "/usr/libexec/getty Pc" xterm on secure +ttyv7 "/usr/libexec/getty Pc" xterm on secure #ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ==== //depot/projects/scottl-camlock/src/etc/etc.sparc64/ttys#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.20 2009/06/14 22:35:33 ed Exp $ +# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.21 2009/11/13 05:54:55 ed Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -15,7 +15,7 @@ # # type The initial terminal type for this port. For hardwired # terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically cons25. +# For virtual consoles, the correct type is typically xterm. # Other common values include network for network connections on # pseudo-terminals, dialup for incoming modem ports, and unknown # when the terminal type cannot be predetermined. @@ -34,15 +34,15 @@ ttya "/usr/libexec/getty 3wire.9600" vt100 off secure ttyb "/usr/libexec/getty 3wire.9600" vt100 off secure # syscons(4) -ttyv0 "/usr/libexec/getty Pc" cons25 on secure +ttyv0 "/usr/libexec/getty Pc" xterm on secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" cons25 on secure -ttyv2 "/usr/libexec/getty Pc" cons25 on secure -ttyv3 "/usr/libexec/getty Pc" cons25 on secure -ttyv4 "/usr/libexec/getty Pc" cons25 on secure -ttyv5 "/usr/libexec/getty Pc" cons25 on secure -ttyv6 "/usr/libexec/getty Pc" cons25 on secure -ttyv7 "/usr/libexec/getty Pc" cons25 on secure +ttyv1 "/usr/libexec/getty Pc" xterm on secure +ttyv2 "/usr/libexec/getty Pc" xterm on secure +ttyv3 "/usr/libexec/getty Pc" xterm on secure +ttyv4 "/usr/libexec/getty Pc" xterm on secure +ttyv5 "/usr/libexec/getty Pc" xterm on secure +ttyv6 "/usr/libexec/getty Pc" xterm on secure +ttyv7 "/usr/libexec/getty Pc" xterm on secure ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ==== //depot/projects/scottl-camlock/src/etc/root/dot.profile#3 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/etc/root/dot.profile,v 1.21 2007/05/29 06:33:10 dougb Exp $ +# $FreeBSD: src/etc/root/dot.profile,v 1.22 2009/11/13 05:54:55 ed Exp $ # PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:~/bin export PATH HOME=/root export HOME -TERM=${TERM:-cons25} +TERM=${TERM:-xterm} export TERM PAGER=more export PAGER ==== //depot/projects/scottl-camlock/src/lib/libc/locale/isgraph.3#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)isgraph.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/locale/isgraph.3,v 1.24 2009/09/04 07:44:58 des Exp $ +.\" $FreeBSD: src/lib/libc/locale/isgraph.3,v 1.25 2009/11/13 09:03:50 roam Exp $ .\" .Dd July 17, 2005 .Dt ISGRAPH 3 @@ -50,7 +50,7 @@ function tests for any printing character except space .Pq Ql "\ " and other -locale specific space-like characters. +locale-specific space-like characters. The value of the argument must be representable as an .Vt "unsigned char" or the value of ==== //depot/projects/scottl-camlock/src/lib/libc/locale/isprint.3#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)isprint.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/isprint.3,v 1.25 2009/09/04 07:44:58 des Exp $ +.\" $FreeBSD: src/lib/libc/locale/isprint.3,v 1.26 2009/11/13 09:07:33 roam Exp $ .\" .Dd July 17, 2005 .Dt ISPRINT 3 @@ -47,7 +47,7 @@ .Sh DESCRIPTION The .Fn isprint -function tests for any printing character including space +function tests for any printing character, including space .Pq Ql "\ " . The value of the argument must be representable as an .Vt "unsigned char" ==== //depot/projects/scottl-camlock/src/lib/libc/net/getnameinfo.c#2 (text+ko) ==== @@ -45,13 +45,14 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.20 2007/02/28 21:18:38 bms Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.21 2009/11/12 11:54:12 ume Exp $"); #include #include #include #include #include +#include #include #include #include @@ -385,6 +386,7 @@ { const struct sockaddr_dl *sdl = (const struct sockaddr_dl *)(const void *)sa; + const struct fw_hwaddr *iha; int n; if (serv != NULL && servlen > 0) @@ -400,6 +402,15 @@ } switch (sdl->sdl_type) { + case IFT_IEEE1394: + if (sdl->sdl_alen < sizeof(iha->sender_unique_ID_hi) + + sizeof(iha->sender_unique_ID_lo)) + return EAI_FAMILY; + iha = (const struct fw_hwaddr *)(const void *)LLADDR(sdl); + return hexname((const u_int8_t *)&iha->sender_unique_ID_hi, + sizeof(iha->sender_unique_ID_hi) + + sizeof(iha->sender_unique_ID_lo), + host, hostlen); /* * The following have zero-length addresses. * IFT_ATM (net/if_atmsubr.c) ==== //depot/projects/scottl-camlock/src/lib/libc/net/ip6opt.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/ip6opt.c,v 1.8 2005/07/19 18:13:58 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/ip6opt.c,v 1.9 2009/11/11 15:21:06 ume Exp $"); #include #include @@ -55,8 +55,7 @@ * byte, the length byte, and the option data. */ int -inet6_option_space(nbytes) - int nbytes; +inet6_option_space(int nbytes) { nbytes += 2; /* we need space for nxt-hdr and length fields */ return(CMSG_SPACE((nbytes + 7) & ~7)); @@ -68,10 +67,7 @@ * success or -1 on an error. */ int -inet6_option_init(bp, cmsgp, type) - void *bp; - struct cmsghdr **cmsgp; - int type; +inet6_option_init(void *bp, struct cmsghdr **cmsgp, int type) { struct cmsghdr *ch = (struct cmsghdr *)bp; @@ -98,11 +94,8 @@ * earlier. It must have a value between 0 and 7, inclusive. */ int -inet6_option_append(cmsg, typep, multx, plusy) - struct cmsghdr *cmsg; - const u_int8_t *typep; - int multx; - int plusy; +inet6_option_append(struct cmsghdr *cmsg, const u_int8_t *typep, int multx, + int plusy) { int padlen, optlen, off; u_char *bp = (u_char *)cmsg + cmsg->cmsg_len; @@ -171,11 +164,7 @@ * */ u_int8_t * -inet6_option_alloc(cmsg, datalen, multx, plusy) - struct cmsghdr *cmsg; - int datalen; - int multx; - int plusy; +inet6_option_alloc(struct cmsghdr *cmsg, int datalen, int multx, int plusy) { int padlen, off; u_int8_t *bp = (u_char *)cmsg + cmsg->cmsg_len; @@ -238,9 +227,7 @@ * (RFC 2292, 6.3.5) */ int -inet6_option_next(cmsg, tptrp) - const struct cmsghdr *cmsg; - u_int8_t **tptrp; +inet6_option_next(const struct cmsghdr *cmsg, u_int8_t **tptrp) { struct ip6_ext *ip6e; int hdrlen, optlen; @@ -296,10 +283,7 @@ * it's a typo. The variable should be type of u_int8_t **. */ int -inet6_option_find(cmsg, tptrp, type) - const struct cmsghdr *cmsg; - u_int8_t **tptrp; - int type; +inet6_option_find(const struct cmsghdr *cmsg, u_int8_t **tptrp, int type) { struct ip6_ext *ip6e; int hdrlen, optlen; @@ -352,8 +336,7 @@ * calculated length and the limitation of the buffer. */ static int -ip6optlen(opt, lim) - u_int8_t *opt, *lim; +ip6optlen(u_int8_t *opt, u_int8_t *lim) { int optlen; ==== //depot/projects/scottl-camlock/src/lib/libc/nls/nl_NL.ISO8859-1.msg#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$ $FreeBSD: src/lib/libc/nls/nl_NL.ISO8859-1.msg,v 1.1 2009/03/13 10:40:38 gabor Exp $ +$ $FreeBSD: src/lib/libc/nls/nl_NL.ISO8859-1.msg,v 1.2 2009/11/11 18:28:12 rene Exp $ $ $ Message catalog for nl_NL.ISO8859-1 locale $ @@ -26,7 +26,7 @@ $ ECHILD 10 Geen kindprocessen $ EDEADLK -11 Een deadlock is vermeden +11 Een deadlock op een bron is vermeden $ ENOMEM 12 Kan geen geheugen meer verkrijgen $ EACCES @@ -40,13 +40,13 @@ $ EEXIST 17 Bestand bestaat reeds $ EXDEV -18 Verwijzing tussen bestanden op verschillende bestandssystemen +18 Verwijzing tussen verschillende apparaten $ ENODEV 19 Bewerking wordt niet ondersteund door dit apparaat $ ENOTDIR 20 Dit is geen map $ EISDIR -21 Dit is een map +21 Dit is een map $ EINVAL 22 Ongeldig argument $ ENFILE @@ -62,7 +62,7 @@ $ ENOSPC 28 Geen ruimte meer op dit apparaat $ ESPIPE -29 Onuitvoerbare zoekopdracht +29 Ongeldige zoekopdracht $ EROFS 30 Van dit bestandssysteem kan alleen worden gelezen $ EMLINK @@ -84,7 +84,7 @@ $ EDESTADDRREQ 39 Een bestemmingsadres is vereist $ EMSGSIZE -40 Te grote bericht +40 Te groot bericht $ EPROTOTYPE 41 Protocol past niet bij dit contactpunt $ ENOPROTOOPT @@ -116,7 +116,7 @@ $ ENOBUFS 55 Geen bufferruimte meer beschikbaar $ EISCONN -56 Dit contactpunt is al verbonden +56 Contactpunt is al verbonden $ ENOTCONN 57 Contactpunt is niet verbonden $ ESHUTDOWN @@ -136,9 +136,9 @@ $ EHOSTUNREACH 65 Bestemming niet bereikbaar $ ENOTEMPTY -66 Directory is niet leeg +66 Map is niet leeg $ EPROCLIM -67 Te veel taken +67 Te veel processen $ EUSERS 68 Te veel gebruikers $ EDQUOT @@ -160,7 +160,7 @@ $ ENOLCK 77 Geen sloten beschikbaar $ ENOSYS -78 Deze systeemfunctie is niet geimplementeerd +78 Systeemfunctie is niet geimplementeerd $ EFTYPE 79 Bestandsformaat niet van toepassing $ EAUTH @@ -173,30 +173,24 @@ 83 Geen bericht van het gewenste type $ EOVERFLOW 84 Waarde te groot om te bewaren in gegevenstype +$ ECANCELED +85 Bewerking geannuleerd $ EILSEQ -85 Ongeldige bytereeks -$ ENOTSUP -86 Niet ondersteund -$ ECANCELED -87 Bewerking geannuleerd +86 Ongeldige bytereeks +$ ENOATTR +87 Attribuut niet gevonden +$ EDOOFUS +88 Programmeerfout $ EBADMSG -88 Verkeerd of defect bericht -$ ENODATA -89 Geen bericht beschikbaar -$ ENOSR -90 Geen STREAM-voorraad -$ ENOSTR -91 Dit is geen STREAM -$ ETIME -92 STREAM-ioctl verlopen -$ ENOATTR -93 Attribuut niet gevonden +89 Verkeerd of defect bericht $ EMULTIHOP -94 Multihopverzoek +90 Multihopverzoek $ ENOLINK -95 Verbinding werd verstoord +91 Verbinding werd verstoord $ EPROTO -96 Protocolfout +92 Protocolfout +$ ENOTCAPABLE +93 Onvoldoende mogelijkheden $ $ strsignal() support catalog $ @@ -263,5 +257,38 @@ 30 Gebruikersignaal 1 $ SIGUSR2 31 Gebruikersignaal 2 -$ SIGPWR -32 Stroomuitval/stroominschakeling +$ +$ gai_strerror() support catalog +$set 3 +$ 1 (obsolete) +1 Adresfamilie voor hostnaam niet ondersteund +$ EAI_AGAIN +2 Tijdelijke fout in naamresolutie +$ EAI_BADFLAGS +3 Ongeldige waarde voor ai_flags +$ EAI_FAIL +4 Onherstelbare fout in naamresolutie +$ EAI_FAMILY +5 ai_familie niet ondersteund +$ EAI_MEMORY +6 Geheugenallocatiefout +$ 7 (obsolete) +7 Geen adres met hostnaam geassocieerd +$ EAI_NONAME +8 hostname noch servname gegeven, of onbekend +$ EAI_SERVICE +9 servname niet ondersteund voor ai_socktype +$ EAI_SOCKTYPE +10 ai_socktype niet ondersteund +$ EAI_SYSTEM +11 Systeemfout geretourneerd in errno +$ EAI_BADHINTS +12 Ongeldige waarde voor hints +$ EAI_PROTOCOL +13 Opgelost protocol is onbekend +$ EAI_OVERFLOW +14 Argumentbuffer overstroomd +$ 0 +32766 Succes +$ NL_MSGMAX +32767 Onbekende fout ==== //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.c#6 (text+ko) ==== @@ -156,7 +156,7 @@ #define MALLOC_DSS #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.185 2009/09/26 18:20:40 alc Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.186 2009/11/14 09:31:47 cperciva Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -5116,7 +5116,7 @@ arena_maxclass = chunksize - (arena_chunk_header_npages << PAGE_SHIFT); - UTRACE(0, 0, 0); + UTRACE((void *)(intptr_t)(-1), 0, 0); #ifdef MALLOC_STATS memset(&stats_chunks, 0, sizeof(chunk_stats_t)); ==== //depot/projects/scottl-camlock/src/lib/libc/sys/vfork.2#2 (text+ko) ==== @@ -26,14 +26,14 @@ .\" SUCH DAMAGE. .\" .\" @(#)vfork.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/vfork.2,v 1.27 2007/01/09 00:28:16 imp Exp $ +.\" $FreeBSD: src/lib/libc/sys/vfork.2,v 1.29 2009/11/13 13:26:27 brueffer Exp $ .\" -.Dd June 4, 1993 +.Dd November 13, 2009 .Dt VFORK 2 .Os .Sh NAME .Nm vfork -.Nd spawn new process in a virtual memory efficient way +.Nd create a new process without copying the address space .Sh LIBRARY .Lb libc .Sh SYNOPSIS @@ -113,14 +113,6 @@ system call appeared in .Bx 2.9 . .Sh BUGS -This system call will be eliminated when proper system sharing -mechanisms are implemented. -Users should not depend on the memory -sharing semantics of -.Fn vfork -as it will, in that case, be made synonymous to -.Xr fork 2 . -.Pp To avoid a possible deadlock situation, processes that are children in the middle of a ==== //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_unix/pam_unix.8#3 (text+ko) ==== @@ -32,7 +32,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libpam/modules/pam_unix/pam_unix.8,v 1.15 2009/06/20 10:09:59 des Exp $ +.\" $FreeBSD: src/lib/libpam/modules/pam_unix/pam_unix.8,v 1.16 2009/11/13 11:19:26 des Exp $ .\" .Dd June 20, 2009 .Dt PAM_UNIX 8 @@ -105,6 +105,17 @@ If the password database has no password for the entity being authenticated, then this option will forgo password prompting, and silently allow authentication to succeed. +.Pp +.Sy NOTE: +If +.Nm +is invoked by a process that does not have the privileges required to +access the password database (in most cases, this means root +privileges), the +.Cm nullok +option may cause +.Nm +to allow any user to log in with any password. .It Cm local_pass Use only the local password database, even if NIS is in use. This will cause an authentication failure if the system is configured ==== //depot/projects/scottl-camlock/src/libexec/rtld-elf/rtld.c#7 (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/libexec/rtld-elf/rtld.c,v 1.140 2009/10/10 15:27:10 kib Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.141 2009/11/14 15:08:44 rwatson Exp $ */ /* @@ -3425,7 +3425,7 @@ if (object_match_name(needed->obj, name)) return needed->obj; } - _rtld_error("%s: Unexpected inconsistency: dependency %s not found", + _rtld_error("%s: Unexpected inconsistency: dependency %s not found", obj->path, name); die(); } ==== //depot/projects/scottl-camlock/src/release/picobsd/floppy.tree/etc/ttys#3 (text+ko) ==== @@ -1,26 +1,26 @@ # # @(#)ttys 5.1 (Berkeley) 4/17/89 # -# $FreeBSD: src/release/picobsd/floppy.tree/etc/ttys,v 1.5 2009/02/19 23:29:05 luigi Exp $ +# $FreeBSD: src/release/picobsd/floppy.tree/etc/ttys,v 1.6 2009/11/13 11:32:14 ed Exp $ # # name getty type status comments # # This entry needed for asking password when init goes to single-user mode # If you want to be asked for password, change "secure" to "insecure" here #console none unknown off secure -vga none cons25 off secure +vga none xterm off secure # -ttyv0 "/usr/libexec/getty Pc" cons25 on secure +ttyv0 "/usr/libexec/getty Pc" xterm on secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" cons25 on secure -ttyv2 "/usr/libexec/getty Pc" cons25 on secure -ttyv3 "/usr/libexec/getty Pc" cons25 on secure -ttyv4 "/usr/libexec/getty Pc" cons25 on secure -ttyv5 "/usr/libexec/getty Pc" cons25 on secure -ttyv6 "/usr/libexec/getty Pc" cons25 on secure -ttyv7 "/usr/libexec/getty Pc" cons25 on secure -#ttyv8 "/usr/libexec/getty Pc" cons25 on secure -#ttyv9 "/usr/libexec/getty Pc" cons25 on secure +ttyv1 "/usr/libexec/getty Pc" xterm on secure +ttyv2 "/usr/libexec/getty Pc" xterm on secure +ttyv3 "/usr/libexec/getty Pc" xterm on secure +ttyv4 "/usr/libexec/getty Pc" xterm on secure +ttyv5 "/usr/libexec/getty Pc" xterm on secure +ttyv6 "/usr/libexec/getty Pc" xterm on secure +ttyv7 "/usr/libexec/getty Pc" xterm on secure +#ttyv8 "/usr/libexec/getty Pc" xterm on secure +#ttyv9 "/usr/libexec/getty Pc" xterm on secure # Pseudo terminals ttyp0 none network secure >>> TRUNCATED FOR MAIL (1000 lines) <<<