From owner-p4-projects@FreeBSD.ORG Thu Jun 30 06:48:38 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 368E616A420; Thu, 30 Jun 2005 06:48:38 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED99616A41C for ; Thu, 30 Jun 2005 06:48:37 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C3E2843D48 for ; Thu, 30 Jun 2005 06:48:37 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5U6mb2H086479 for ; Thu, 30 Jun 2005 06:48:37 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5U6mbrU086476 for perforce@freebsd.org; Thu, 30 Jun 2005 06:48:37 GMT (envelope-from peter@freebsd.org) Date: Thu, 30 Jun 2005 06:48:37 GMT Message-Id: <200506300648.j5U6mbrU086476@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 79253 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jun 2005 06:48:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=79253 Change 79253 by peter@peter_overcee on 2005/06/30 06:48:25 IFC @79252 Affected files ... .. //depot/projects/hammer/UPDATING#79 integrate .. //depot/projects/hammer/etc/network.subr#11 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#36 integrate .. //depot/projects/hammer/etc/rc.d/netif#12 integrate .. //depot/projects/hammer/etc/rc.d/wpa_supplicant#1 branch .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#100 integrate .. //depot/projects/hammer/sbin/dhclient/dhclient.c#3 integrate .. //depot/projects/hammer/sbin/dhclient/dhcp.h#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#28 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#73 integrate .. //depot/projects/hammer/sys/conf/files.amd64#72 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#26 integrate .. //depot/projects/hammer/sys/i386/i386/initcpu.c#13 integrate .. //depot/projects/hammer/sys/i386/include/md_var.h#16 integrate .. //depot/projects/hammer/sys/modules/Makefile#81 integrate .. //depot/projects/hammer/usr.sbin/kbdmap/kbdmap.c#3 integrate Differences ... ==== //depot/projects/hammer/UPDATING#79 (text+ko) ==== @@ -21,6 +21,13 @@ developers choose to disable these features on build machines to maximize performance. +20050629: + The pccard_ifconfig rc.conf variable has been removed and a new + variable, ifconfig_DEFAULT has been introduced. Unlike + pccard_ifconfig, ifconfig_DEFAULT applies to ALL interfaces that + do not have ifconfig_ifn entries rather than just those in + removable_interfaces. + 20050610: Major changes to network interface API. All drivers must be recompiled. Drivers not in the base system will need to be @@ -382,4 +389,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.414 2005/06/10 19:59:26 jkoshy Exp $ +$FreeBSD: src/UPDATING,v 1.415 2005/06/30 05:02:34 brooks Exp $ ==== //depot/projects/hammer/etc/network.subr#11 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.162 2005/06/07 23:59:45 brooks Exp $ +# $FreeBSD: src/etc/network.subr,v 1.164 2005/06/30 05:02:34 brooks Exp $ # # @@ -48,7 +48,7 @@ fi if wpaif $1; then - #/etc/rc.d/wpa_supplicant start $1 + /etc/rc.d/wpa_supplicant start $1 _cfg=0 # XXX: not sure this should count fi @@ -89,7 +89,7 @@ IFS="$oldifs" if wpaif $1; then - #/etc/rc.d/wpa_supplicant stop $1 + /etc/rc.d/wpa_supplicant stop $1 _cfg=0 fi @@ -113,16 +113,11 @@ fi eval _args=\$ifconfig_$1 - if [ -z "$_args" -a -n "${pccard_ifconfig}" ]; then - for _if in ${removable_interfaces} ; do - if [ "$_if" = "$_ifn" ] ; then - _args=${pccard_ifconfig} - break - fi - done + if [ -z "$_args" ]; then + _args=$ifconfig_DEFAULT fi - echo $_args + echo "$_args" } # ifconfig_getargs if @@ -394,7 +389,7 @@ _tmplist="`ifconfig -l`" ;; *) - _tmplist="${network_interfaces} ${cloned_interfaces}" + _tmplist="${network_interfaces} ${removable_interfaces} ${cloned_interfaces}" ;; esac @@ -408,37 +403,15 @@ _aprefix= _bprefix= for _if in ${_tmplist} ; do - eval _ifarg="\$ifconfig_${_if}" - case "$_ifarg" in - [Dd][Hh][Cc][Pp]) + if dhcpif $_if; then _dhcplist="${_dhcplist}${_aprefix}${_if}" [ -z "$_aprefix" ] && _aprefix=' ' - ;; - ''|*) + elif [ -n "`_ifconfig_getargs $if`" ]; then _nodhcplist="${_nodhcplist}${_bprefix}${_if}" [ -z "$_bprefix" ] && _bprefix=' ' - ;; - esac + fi done - case ${pccard_ifconfig} in - [Dd][Hh][Cc][Pp]) - for _if in ${removable_interfaces} ; do - _test_if=`ifconfig ${_if} 2>&1` - case "$_test_if" in - "ifconfig: interface $_if does not exist") - ;; - *) - _dhcplist="${_dhcplist}${_aprefix}${_if}" - [ -z "$_aprefix" ] && _aprefix=' ' - ;; - esac - done - ;; - *) - ;; - esac - case "$type" in nodhcp) echo $_nodhcplist ==== //depot/projects/hammer/etc/rc.d/Makefile#36 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.52 2005/04/29 23:02:56 brooks Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.53 2005/06/30 04:52:47 brooks Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ @@ -36,7 +36,7 @@ timed tmp \ ugidfw usbd \ var virecover \ - watchdogd \ + watchdogd wpa_supplicant \ ypbind yppasswdd ypserv \ ypset ypupdated ypxfrd FILESDIR= /etc/rc.d ==== //depot/projects/hammer/etc/rc.d/netif#12 (text+ko) ==== @@ -22,7 +22,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/etc/rc.d/netif,v 1.13 2005/06/07 04:49:12 brooks Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.14 2005/06/30 04:46:21 brooks Exp $ # # PROVIDE: netif @@ -109,13 +109,10 @@ # _cooked_list= if [ -n "$_cmdifn" ]; then - for i in $_cmdifn ; do - eval _if=\"`expr "$_ifn_list" : ".*\(${i}\).*"`\" - if [ -z "$_if" ]; then - err 1 "No such network interface: $i" - fi - _cooked_list="$_cooked_list $_if" - done + # Don't check that the interfaces exist. We need to run + # the down code even when the interface doesn't exist to + # kill off wpa_supplicant. + _cooked_list="$_cmdifn" else _cooked_list="$_ifn_list" fi ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#100 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.878 2005/06/19 12:38:18 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.879 2005/06/30 04:55:46 bmah Exp $ 2000 @@ -26,7 +26,8 @@ The release notes for &os; &release.current; contain a summary - of the changes made to the &os; base system since &release.branch; is created. + of the changes made to the &os; base system on the + &release.branch; development line. This document lists applicable security advisories that were issued since the last release, as well as significant changes to the &os; kernel and userland. @@ -136,7 +137,7 @@ FreeBSD-SA-05:01.telnet. &merged; - A information disclosure vulnerability in the + An information disclosure vulnerability in the &man.sendfile.2; system call, which could permit it to transmit random parts of kernel memory, has been fixed. More details are in security advisory @@ -168,12 +169,12 @@ allowed unprivileged local users can send commands to the hardware supported by the &man.iir.4; driver, has been fixed. For more information, see security advisory - FreeBSD-SA-05:06.iir. + FreeBSD-SA-05:06.iir. &merged; A bug in the validation of &man.i386.get.ldt.2; system call - input arguments, which may allow kernel memory may be disclosed - to the user process, has been fixed. For more information, see + input arguments, which may allow kernel memory to be disclosed + to a user process, has been fixed. For more information, see security advisory FreeBSD-SA-05:07.ldt. &merged; @@ -247,6 +248,8 @@ + + Value @@ -257,22 +260,22 @@ 0 - show all mount-points without any restrictions + Show all mount-points without any restrictions. 1 - show only mount-points below jail's chroot and show only part of the - mount-point's path (if jail's chroot directory is + Show only mount-points below jail's chroot and show only part of the + mount-point's path (for example, if the jail's chroot directory is /jails/foo and mount-point is - /jails/foo/usr/home - only /usr/home will be shown) + /jails/foo/usr/home, + only /usr/home will be shown). 2 - show only mount-point where jail's chroot directory is placed. + Show only mount-point where jail's chroot directory is placed. @@ -390,7 +393,7 @@ The autoboot loader command now supports the prompt parameter. - The autoboot will now prevent the user + The autoboot loader command will now prevent the user from interrupting the boot process at all if the autoboot_delay variable is set to -1. &merged; @@ -416,10 +419,8 @@ hw.pci.do_powerstate sysctls to 0. The &man.acpi.ibm.4; driver for IBM laptops - has been added. - - The &man.acpi.ibm.4; driver has been - improved to support hotkeys and reading fan status and thermal + has been added. It provides support for the various + hotkeys and reading fan status and thermal sensors. The &man.acpi.fujitsu.4; driver for handling @@ -431,10 +432,11 @@ The &man.atkbdc.4;, &man.atkbd.4;, and &man.psm.4; drivers have been rewritten in more bus-independent way, - and now support EBus found on sparc64 platform. + and now support the EBus found on the sparc64 platform. The following device drivers have been - added and enabled by default: + added and enabled by default in the + GENERIC kernel: &man.atkbdc.4;, &man.atkbd.4;, creator(4), @@ -446,7 +448,7 @@ &man.ums.4;, and &man.usb.4;. - The &man.auxio.4; driver has been to drive + The &man.auxio.4; driver has been added; it supports some auxiliary I/O functions found on various SBus/EBus &ultrasparc; models. &merged; @@ -572,7 +574,7 @@ between this feature and promiscuous mode. &merged; Ethernet flow control is now disabled by default in the - &man.fxp.4; driver, to prevent problems with a system panics + &man.fxp.4; driver, to prevent problems on a subnet when a system panics or is left in the kernel debugger. &merged; The gx(4) driver has been removed because @@ -679,8 +681,9 @@ support IPv6. &man.ipfw.8; now supports classification and tagging - of &man.altq.4; packets via a divert socket, - as well as the TCP data length. + of &man.altq.4; packets via a divert socket. It is also + possible to specify rules that match TCP packets with specific + payload sizes. The &man.ipfw.8; ipfw fwd rule now supports the full packet destination manipulation when the kernel option @@ -692,7 +695,7 @@ Note that &man.ipfw.8; rules have to be carefully crafted to make sure that things like PMTU discovery do not break. &merged; - The &man.ipfw.8; now supports IPv4 only rules. + The &man.ipfw.8; system now supports IPv4 only rules. &man.ipnat.8; now allows redirect rules to work for non-TCP/UDP packets. &merged; @@ -704,7 +707,7 @@ The libalias library can now be built as a kernel module. - The link state change notifications of network interface + The link state change notifications of network interfaces are sent to /dev/devctl now. A new &man.ng.ipfw.4; NetGraph node provides @@ -946,18 +949,19 @@ &man.getservbyport.3; functions are now thread-safe. &merged; For conformation to IEEE Std 1003.1-2001 - (also known as POSIX 2001), the n_net + (also known as POSIX 2001), the n_net member of struct netent and the first argument - of &man.getnetbyaddr.3; has been changed to an uint32_t. - Due to these changes the ABI on 64-bit platforms becomes + of &man.getnetbyaddr.3; has been changed to an uint32_t. + Due to these changes, the ABI on 64-bit platforms is incompatible with previous releases of &os; and - the major version number of libpcap has been bumped. - If you upgrade &os; for 64-bit platforms, note that all of - the userland programs which use &man.getnetbyaddr.3;, - &man.getnetbyname.3;, &man.getnetent.3; and/or - libpcap have to be recompiled. + the major version number of the libpcap + shared library has been bumped. + On 64-bit platforms being upgraded from older &os; versions, all + userland programs that use &man.getnetbyaddr.3;, + &man.getnetbyname.3;, &man.getnetent.3;, and/or + libpcap have to be recompiled. - The gvinum(8) utility now supports + The gvinum(8) utility now supports the checkparity, rebuildparity, and setstate @@ -1099,22 +1103,22 @@ The &man.periodic.8; security output now supports the display of information about blocked packet counts from &man.pf.4;. &merged; - The &man.pgrep.1; now supports an option - which allows to match system processes (kernel threads). + The &man.pgrep.1; command now supports a option + which allows matching system processes (kernel threads). - The &man.pgrep.1; and &man.pkill.1; now support an - option which allows to use file where PID is stored - for matching. + The &man.pgrep.1; and &man.pkill.1; commands now support a + option, which matches a process whose PID is + stored in a file. - The &man.pgrep.1; and &man.pkill.1; now support an + The &man.pgrep.1; and &man.pkill.1; commands now support a option to ignore case in the process match. - The &man.pgrep.1; and &man.pkill.1; now support an - option which allows to match processes - based on its &man.jail.2; ID. + The &man.pgrep.1; and &man.pkill.1; commands now support a + option that matches processes + based on their &man.jail.2; ID. - The &man.pgrep.1; and &man.pkill.1; now support an - option which allows to match oldest + The &man.pgrep.1; and &man.pkill.1; commands now support a + option which matches only the oldest (least recently started) of the matching processes. The &man.powerd.8; program for managing power consumption has been @@ -1137,11 +1141,11 @@ which violates the Microsoft PPP Callback Control Protocol section 3.2. &merged; - The &man.ps.1; now supports a jid - keyword in the option. It displays + The &man.ps.1; utility now supports a jid + keyword in the option. It displays the &man.jail.2; ID of each process. - The &man.pstat.8; now supports a option + The &man.pstat.8; program now supports a option to print swap sizes with SI prefixes such as K, M, and G, which are used to form binary multiples. @@ -1158,7 +1162,7 @@ The &man.rexecd.8; utility has been removed. There are no rexec clients in the &os; tree, and the client function &man.rexec.3; is present only in - libcompat. + libcompat. The &man.rm.1; utility now supports an option that asks for confirmation (once) if recursively @@ -1239,7 +1243,7 @@ connection, has been added. It was obtained from OpenBSD. &merged; - &man.what.1; now support a flag, which + &man.what.1; now supports a flag, which causes it to print matching text, but not format it. &man.whois.1; now supports @@ -1344,7 +1348,8 @@ to 1.0.3. OpenBSD dhclient as of OpenBSD 3.7 - has been imported. + has been imported. It replaces the ISC DHCP client used in + prior versions of &os;. FILE has been updated from 4.10 to 4.12. @@ -1417,7 +1422,7 @@ version 8.13.3 to version 8.13.4. It now supports OSTYPE(freebsd6). - TCPDUMP has been updated from + tcpdump has been updated from v3.8.3 to v3.9.1 (alpha 096). tcsh has been updated from @@ -1504,7 +1509,7 @@ The supported version of the GNOME desktop environment has been - updated from 2.6.2 to 2.10. More information about + updated from 2.6.2 to 2.10.1. More information about running GNOME on &os; can be found on the FreeBSD GNOME Project Web page. &merged; ==== //depot/projects/hammer/sbin/dhclient/dhclient.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* $OpenBSD: dhclient.c,v 1.63 2005/02/06 17:10:13 krw Exp $ */ -/* $FreeBSD: src/sbin/dhclient/dhclient.c,v 1.4 2005/06/13 23:43:08 brooks Exp $ */ +/* $FreeBSD: src/sbin/dhclient/dhclient.c,v 1.6 2005/06/30 05:50:52 brooks Exp $ */ /* * Copyright 2004 Henning Brauer @@ -2228,13 +2228,18 @@ case DHO_NETBIOS_DD_SERVER: case DHO_FONT_SERVERS: case DHO_DHCP_SERVER_IDENTIFIER: + case DHO_SMTP_SERVER: + case DHO_POP_SERVER: + case DHO_NNTP_SERVER: + case DHO_WWW_SERVER: + case DHO_FINGER_SERVER: + case DHO_IRC_SERVER: if (!ipv4addrs(opbuf)) { warning("Invalid IP address in option: %s", opbuf); return (0); } return (1) ; case DHO_HOST_NAME: - case DHO_DOMAIN_NAME: case DHO_NIS_DOMAIN: if (!res_hnok(sbuf)) { warning("Bogus Host Name option %d: %s (%s)", option, @@ -2242,6 +2247,7 @@ return (0); } return (1); + case DHO_DOMAIN_NAME: case DHO_PAD: case DHO_TIME_OFFSET: case DHO_BOOT_SIZE: ==== //depot/projects/hammer/sbin/dhclient/dhcp.h#2 (text+ko) ==== @@ -1,4 +1,5 @@ /* $OpenBSD: dhcp.h,v 1.5 2004/05/04 15:49:49 deraadt Exp $ */ +/* $FreeBSD: src/sbin/dhclient/dhcp.h,v 1.2 2005/06/30 05:50:52 brooks Exp $ */ /* Protocol structures... */ @@ -154,6 +155,12 @@ #define DHO_DHCP_REBINDING_TIME 59 #define DHO_DHCP_CLASS_IDENTIFIER 60 #define DHO_DHCP_CLIENT_IDENTIFIER 61 +#define DHO_SMTP_SERVER 69 +#define DHO_POP_SERVER 70 +#define DHO_NNTP_SERVER 71 +#define DHO_WWW_SERVER 72 +#define DHO_FINGER_SERVER 73 +#define DHO_IRC_SERVER 74 #define DHO_DHCP_USER_CLASS_ID 77 #define DHO_END 255 ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#28 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.102 2005/02/28 23:37:35 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.103 2005/06/30 05:33:26 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/conf/NOTES#73 (text+ko) ==== @@ -5,7 +5,7 @@ # machine independent notes, look in /sys/conf/NOTES. # # (XXX from i386:NOTES,v 1.1201) -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.35 2005/06/14 14:21:25 ups Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.36 2005/06/30 05:33:25 peter Exp $ # # @@ -16,7 +16,7 @@ # # We want LINT to cover profiling as well. -#XXX#profile 2 +profile 2 ##################################################################### ==== //depot/projects/hammer/sys/conf/files.amd64#72 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.69 2005/06/14 04:16:10 marcel Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.70 2005/06/30 05:33:25 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/hammer/sys/i386/i386/identcpu.c#26 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/identcpu.c,v 1.144 2005/05/29 17:43:24 schweikh Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/identcpu.c,v 1.145 2005/06/30 06:44:34 peter Exp $"); #include "opt_cpu.h" ==== //depot/projects/hammer/sys/i386/i386/initcpu.c#13 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/initcpu.c,v 1.50 2005/05/16 09:47:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/initcpu.c,v 1.51 2005/06/30 06:44:34 peter Exp $"); #include "opt_cpu.h" ==== //depot/projects/hammer/sys/i386/include/md_var.h#16 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/md_var.h,v 1.71 2005/05/16 09:47:53 obrien Exp $ + * $FreeBSD: src/sys/i386/include/md_var.h,v 1.72 2005/06/30 06:44:34 peter Exp $ */ #ifndef _MACHINE_MD_VAR_H_ ==== //depot/projects/hammer/sys/modules/Makefile#81 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.448 2005/06/21 13:01:14 dumbbell Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.449 2005/06/30 05:37:48 peter Exp $ # oldcard -- specialized use for debugging only. # owi -- totally unsupported for debugging only. @@ -423,6 +423,7 @@ #_acpi= acpi # doesn't work on amd64 yet _agp= agp _arcmsr= arcmsr +_ath_hal= ath_hal _ciss= ciss _cpufreq= cpufreq _digi= digi ==== //depot/projects/hammer/usr.sbin/kbdmap/kbdmap.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/kbdmap/kbdmap.c,v 1.2 2002/10/27 17:44:33 wollman Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/kbdmap/kbdmap.c,v 1.3 2005/06/30 05:31:01 ru Exp $"); #include #include @@ -571,7 +571,7 @@ /* en_US.ISO8859-1 -> en_..\.ISO8859-1 */ strlcpy(dialect, lang, sizeof(dialect)); - if (strlen(dialect) >= 6 && dialect[2] == '-') { + if (strlen(dialect) >= 6 && dialect[2] == '_') { dialect[3] = '.'; dialect[4] = '.'; } @@ -579,8 +579,8 @@ /* en_US.ISO8859-1 -> en */ strlcpy(lang_abk, lang, sizeof(lang_abk)); - if (strlen(lang_abk) >= 3 && lang_abk[2] == '-') - lang_abk[2] = '.'; + if (strlen(lang_abk) >= 3 && lang_abk[2] == '_') + lang_abk[2] = '\0'; fprintf(stderr, "lang_default = %s\n", lang_default); fprintf(stderr, "dialect = %s\n", dialect);