PERFORCE change 31048 for review

Marcel Moolenaar marcel at FreeBSD.org
Mon May 12 21:22:54 PDT 2003 

http://perforce.freebsd.org/chv.cgi?CH=31048

Change 31048 by marcel at marcel_pluto1 on 2003/05/12 21:22:18

	IFC @31036

Affected files ...

.. //depot/projects/ia64/bin/echo/echo.1#3 integrate
.. //depot/projects/ia64/contrib/gcc/config/i386/freebsd.h#16 integrate
.. //depot/projects/ia64/crypto/openssh/log.h#5 integrate
.. //depot/projects/ia64/crypto/telnet/telnet/commands.c#9 integrate
.. //depot/projects/ia64/crypto/telnet/telnet/externs.h#3 integrate
.. //depot/projects/ia64/crypto/telnet/telnet/main.c#5 integrate
.. //depot/projects/ia64/crypto/telnet/telnet/telnet.c#5 integrate
.. //depot/projects/ia64/crypto/telnet/telnetd/telnetd.c#4 integrate
.. //depot/projects/ia64/etc/devd.conf#5 integrate
.. //depot/projects/ia64/etc/network.subr#3 integrate
.. //depot/projects/ia64/etc/pccard_ether#6 integrate
.. //depot/projects/ia64/etc/rc.d/network_ipv6#5 integrate
.. //depot/projects/ia64/kerberos5/include/config.h#7 integrate
.. //depot/projects/ia64/kerberos5/usr.bin/kadmin/Makefile#2 integrate
.. //depot/projects/ia64/kerberos5/usr.sbin/ktutil/Makefile#6 integrate
.. //depot/projects/ia64/lib/libc/alpha/arith.h#2 integrate
.. //depot/projects/ia64/lib/libc/amd64/arith.h#3 integrate
.. //depot/projects/ia64/lib/libc/amd64/gen/Makefile.inc#3 integrate
.. //depot/projects/ia64/lib/libc/amd64/gen/ldexp.c#1 branch
.. //depot/projects/ia64/lib/libc/amd64/gen/setjmp.S#3 integrate
.. //depot/projects/ia64/lib/libc/i386/arith.h#2 integrate
.. //depot/projects/ia64/lib/libc/ia64/arith.h#2 integrate
.. //depot/projects/ia64/lib/libc/powerpc/arith.h#2 integrate
.. //depot/projects/ia64/lib/libc/sparc64/arith.h#2 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_kern.c#4 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#3 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_private.h#2 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_sig.c#3 integrate
.. //depot/projects/ia64/lib/libwrap/Makefile#4 integrate
.. //depot/projects/ia64/libexec/Makefile#15 integrate
.. //depot/projects/ia64/libexec/telnetd/global.c#2 integrate
.. //depot/projects/ia64/libexec/telnetd/slc.c#3 integrate
.. //depot/projects/ia64/libexec/telnetd/state.c#4 integrate
.. //depot/projects/ia64/libexec/telnetd/sys_term.c#6 integrate
.. //depot/projects/ia64/libexec/telnetd/telnetd.c#3 integrate
.. //depot/projects/ia64/libexec/telnetd/termstat.c#3 integrate
.. //depot/projects/ia64/libexec/telnetd/utility.c#3 integrate
.. //depot/projects/ia64/release/alpha/drivers.conf#11 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#48 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#90 integrate
.. //depot/projects/ia64/release/i386/drivers.conf#19 integrate
.. //depot/projects/ia64/release/scripts/doFS.sh#15 integrate
.. //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#24 integrate
.. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.c#5 integrate
.. //depot/projects/ia64/sbin/growfs/growfs.c#10 integrate
.. //depot/projects/ia64/sbin/ldconfig/ldconfig.8#4 integrate
.. //depot/projects/ia64/sbin/mount_nfs/mount_nfs.8#8 integrate
.. //depot/projects/ia64/sbin/mount_nfs/mount_nfs.c#13 integrate
.. //depot/projects/ia64/sbin/newfs/mkfs.c#28 integrate
.. //depot/projects/ia64/share/examples/netgraph/bluetooth/rc.bluetooth#1 branch
.. //depot/projects/ia64/share/man/man4/Makefile#43 integrate
.. //depot/projects/ia64/share/man/man4/agp.4#3 integrate
.. //depot/projects/ia64/share/man/man4/dc.4#4 integrate
.. //depot/projects/ia64/share/man/man4/man4.i386/gsc.4#3 integrate
.. //depot/projects/ia64/share/man/man4/ng_bluetooth.4#4 integrate
.. //depot/projects/ia64/share/man/man4/ng_bt3c.4#3 integrate
.. //depot/projects/ia64/share/man/man4/ng_btsocket.4#4 integrate
.. //depot/projects/ia64/share/man/man4/ng_h4.4#3 integrate
.. //depot/projects/ia64/share/man/man4/ng_hci.4#4 integrate
.. //depot/projects/ia64/share/man/man4/ng_l2cap.4#3 integrate
.. //depot/projects/ia64/share/man/man4/ng_ubt.4#3 integrate
.. //depot/projects/ia64/share/man/man4/ubtbcmfw.4#1 branch
.. //depot/projects/ia64/share/man/man4/umass.4#8 integrate
.. //depot/projects/ia64/share/man/man5/procfs.5#5 integrate
.. //depot/projects/ia64/share/man/man8/Makefile#8 integrate
.. //depot/projects/ia64/share/man/man9/Makefile#21 integrate
.. //depot/projects/ia64/sys/amd64/amd64/cpu_switch.S#2 integrate
.. //depot/projects/ia64/sys/amd64/amd64/elf_machdep.c#2 integrate
.. //depot/projects/ia64/sys/amd64/amd64/exception.S#3 integrate
.. //depot/projects/ia64/sys/amd64/amd64/genassym.c#2 integrate
.. //depot/projects/ia64/sys/amd64/amd64/identcpu.c#2 integrate
.. //depot/projects/ia64/sys/amd64/amd64/machdep.c#3 integrate
.. //depot/projects/ia64/sys/amd64/amd64/nexus.c#2 integrate
.. //depot/projects/ia64/sys/amd64/amd64/pmap.c#2 integrate
.. //depot/projects/ia64/sys/amd64/amd64/support.S#2 integrate
.. //depot/projects/ia64/sys/amd64/amd64/sys_machdep.c#2 integrate
.. //depot/projects/ia64/sys/amd64/amd64/trap.c#2 integrate
.. //depot/projects/ia64/sys/amd64/conf/GENERIC#2 integrate
.. //depot/projects/ia64/sys/amd64/include/_types.h#3 integrate
.. //depot/projects/ia64/sys/amd64/include/asm.h#2 integrate
.. //depot/projects/ia64/sys/amd64/include/bus.h#2 integrate
.. //depot/projects/ia64/sys/amd64/include/bus_amd64.h#1 branch
.. //depot/projects/ia64/sys/amd64/include/bus_at386.h#2 delete
.. //depot/projects/ia64/sys/amd64/include/bus_dma.h#2 integrate
.. //depot/projects/ia64/sys/amd64/include/bus_memio.h#2 integrate
.. //depot/projects/ia64/sys/amd64/include/bus_pio.h#2 integrate
.. //depot/projects/ia64/sys/amd64/include/frame.h#2 integrate
.. //depot/projects/ia64/sys/amd64/include/md_var.h#2 integrate
.. //depot/projects/ia64/sys/amd64/include/npx.h#2 integrate
.. //depot/projects/ia64/sys/amd64/include/pcb.h#2 integrate
.. //depot/projects/ia64/sys/amd64/include/stdarg.h#2 integrate
.. //depot/projects/ia64/sys/amd64/include/sysarch.h#2 integrate
.. //depot/projects/ia64/sys/amd64/include/ucontext.h#2 integrate
.. //depot/projects/ia64/sys/amd64/isa/icu_vector.S#2 integrate
.. //depot/projects/ia64/sys/boot/common/load_elf.c#12 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/elf64_freebsd.c#2 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/i386_module.c#6 integrate
.. //depot/projects/ia64/sys/compat/svr4/svr4.h#2 integrate
.. //depot/projects/ia64/sys/conf/Makefile.amd64#3 integrate
.. //depot/projects/ia64/sys/conf/files#78 integrate
.. //depot/projects/ia64/sys/conf/majors#22 integrate
.. //depot/projects/ia64/sys/dev/acpica/Osd/OsdHardware.c#6 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-card.c#9 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#14 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-pci.h#9 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-raid.c#22 integrate
.. //depot/projects/ia64/sys/dev/firewire/firewire.c#28 integrate
.. //depot/projects/ia64/sys/dev/firewire/sbp.c#32 integrate
.. //depot/projects/ia64/sys/dev/fxp/if_fxpreg.h#5 integrate
.. //depot/projects/ia64/sys/dev/ips/ips.c#1 branch
.. //depot/projects/ia64/sys/dev/ips/ips.h#1 branch
.. //depot/projects/ia64/sys/dev/ips/ips_commands.c#1 branch
.. //depot/projects/ia64/sys/dev/ips/ips_disk.c#1 branch
.. //depot/projects/ia64/sys/dev/ips/ips_disk.h#1 branch
.. //depot/projects/ia64/sys/dev/ips/ips_ioctl.c#1 branch
.. //depot/projects/ia64/sys/dev/ips/ips_ioctl.h#1 branch
.. //depot/projects/ia64/sys/dev/ips/ips_pci.c#1 branch
.. //depot/projects/ia64/sys/dev/kbd/atkbdc.c#7 integrate
.. //depot/projects/ia64/sys/dev/syscons/syscons.c#19 integrate
.. //depot/projects/ia64/sys/dev/usb/umass.c#25 integrate
.. //depot/projects/ia64/sys/dev/usb/usbdevs#35 integrate
.. //depot/projects/ia64/sys/dev/usb/usbdevs.h#34 integrate
.. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#34 integrate
.. //depot/projects/ia64/sys/geom/geom_dev.c#35 integrate
.. //depot/projects/ia64/sys/geom/geom_disk.c#32 integrate
.. //depot/projects/ia64/sys/i386/conf/GENERIC#34 integrate
.. //depot/projects/ia64/sys/i386/conf/NOTES#40 integrate
.. //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#23 integrate
.. //depot/projects/ia64/sys/kern/kern_mac.c#26 integrate
.. //depot/projects/ia64/sys/kern/kern_malloc.c#22 integrate
.. //depot/projects/ia64/sys/kern/kern_sig.c#49 integrate
.. //depot/projects/ia64/sys/kern/link_elf.c#18 integrate
.. //depot/projects/ia64/sys/kern/subr_mbuf.c#25 integrate
.. //depot/projects/ia64/sys/kern/vfs_subr.c#46 integrate
.. //depot/projects/ia64/sys/modules/Makefile#48 integrate
.. //depot/projects/ia64/sys/modules/ips/Makefile#1 branch
.. //depot/projects/ia64/sys/modules/netgraph/bluetooth/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/netgraph/bluetooth/bluetooth/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/netgraph/bluetooth/bt3c/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/netgraph/bluetooth/h4/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/netgraph/bluetooth/hci/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/netgraph/bluetooth/l2cap/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/netgraph/bluetooth/socket/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/netgraph/bluetooth/ubt/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#1 branch
.. //depot/projects/ia64/sys/netgraph/bluetooth/common/ng_bluetooth.c#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#4 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/h4/TODO#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#4 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/ubt/TODO#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#6 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#1 branch
.. //depot/projects/ia64/sys/netgraph/bluetooth/hci/TODO#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/hci/ng_hci_cmds.c#4 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/hci/ng_hci_cmds.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/hci/ng_hci_evnt.c#4 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/hci/ng_hci_evnt.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/hci/ng_hci_main.c#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/hci/ng_hci_misc.c#4 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/hci/ng_hci_misc.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/hci/ng_hci_prse.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c#4 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/hci/ng_hci_var.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/include/ng_bluetooth.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/include/ng_bt3c.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/include/ng_btsocket.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#1 branch
.. //depot/projects/ia64/sys/netgraph/bluetooth/include/ng_h4.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/include/ng_hci.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/include/ng_l2cap.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/include/ng_ubt.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/TODO#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h#4 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c#4 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#4 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#4 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/socket/TODO#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#7 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#6 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#5 integrate
.. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#1 branch
.. //depot/projects/ia64/sys/pci/if_dc.c#34 integrate
.. //depot/projects/ia64/sys/pci/if_dcreg.h#11 integrate
.. //depot/projects/ia64/sys/sys/_label.h#4 integrate
.. //depot/projects/ia64/sys/sys/mbuf.h#23 integrate
.. //depot/projects/ia64/sys/vm/vm_object.c#53 integrate
.. //depot/projects/ia64/usr.bin/bluetooth/Makefile#4 integrate
.. //depot/projects/ia64/usr.bin/bluetooth/btsockstat/Makefile#4 integrate
.. //depot/projects/ia64/usr.bin/bluetooth/btsockstat/btsockstat.1#5 integrate
.. //depot/projects/ia64/usr.bin/bluetooth/btsockstat/btsockstat.c#4 integrate
.. //depot/projects/ia64/usr.bin/bluetooth/rfcomm_sppd/Makefile#1 branch
.. //depot/projects/ia64/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1#1 branch
.. //depot/projects/ia64/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#1 branch
.. //depot/projects/ia64/usr.bin/sockstat/sockstat.c#3 integrate
.. //depot/projects/ia64/usr.bin/stat/stat.1#3 integrate
.. //depot/projects/ia64/usr.bin/stat/stat.c#5 integrate
.. //depot/projects/ia64/usr.bin/telnet/commands.c#8 integrate
.. //depot/projects/ia64/usr.bin/telnet/externs.h#3 integrate
.. //depot/projects/ia64/usr.bin/telnet/main.c#5 integrate
.. //depot/projects/ia64/usr.bin/telnet/network.c#4 integrate
.. //depot/projects/ia64/usr.bin/telnet/ring.c#3 integrate
.. //depot/projects/ia64/usr.bin/telnet/sys_bsd.c#5 integrate
.. //depot/projects/ia64/usr.bin/telnet/telnet.c#6 integrate
.. //depot/projects/ia64/usr.bin/telnet/terminal.c#4 integrate
.. //depot/projects/ia64/usr.bin/telnet/utilities.c#4 integrate
.. //depot/projects/ia64/usr.sbin/Makefile#37 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/Makefile#4 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt#1 branch
.. //depot/projects/ia64/usr.sbin/bluetooth/bcmfw/Makefile#1 branch
.. //depot/projects/ia64/usr.sbin/bluetooth/bcmfw/README#1 branch
.. //depot/projects/ia64/usr.sbin/bluetooth/bcmfw/bcmfw.8#1 branch
.. //depot/projects/ia64/usr.sbin/bluetooth/bcmfw/bcmfw.c#1 branch
.. //depot/projects/ia64/usr.sbin/bluetooth/bt3cfw/Makefile#2 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/bt3cfw/bt3cfw.8#3 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/bt3cfw/bt3cfw.c#2 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/Makefile#4 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/hccontrol.8#5 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/hccontrol.c#4 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/hccontrol.h#4 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c#4 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/info.c#4 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/link_control.c#4 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/link_policy.c#4 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/node.c#4 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/send_recv.c#4 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/status.c#5 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/util.c#4 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/hcsecd/Makefile#1 branch
.. //depot/projects/ia64/usr.sbin/bluetooth/hcsecd/hcsecd.8#1 branch
.. //depot/projects/ia64/usr.sbin/bluetooth/hcsecd/hcsecd.c#1 branch
.. //depot/projects/ia64/usr.sbin/bluetooth/hcsecd/hcsecd.conf#1 branch
.. //depot/projects/ia64/usr.sbin/bluetooth/hcsecd/hcsecd.h#1 branch
.. //depot/projects/ia64/usr.sbin/bluetooth/hcsecd/lexer.l#1 branch
.. //depot/projects/ia64/usr.sbin/bluetooth/hcsecd/parser.y#1 branch
.. //depot/projects/ia64/usr.sbin/bluetooth/hcseriald/Makefile#4 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/hcseriald/hcseriald.8#5 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/hcseriald/hcseriald.c#4 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/l2control/Makefile#4 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/l2control/l2cap.c#4 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/l2control/l2control.8#5 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/l2control/l2control.c#4 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/l2control/l2control.h#4 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/l2ping/Makefile#4 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/l2ping/l2ping.8#5 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/l2ping/l2ping.c#4 integrate
.. //depot/projects/ia64/usr.sbin/bluetooth/rfcomm_pppd/Makefile#1 branch
.. //depot/projects/ia64/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#1 branch
.. //depot/projects/ia64/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c#1 branch
.. //depot/projects/ia64/usr.sbin/diskinfo/diskinfo.8#2 integrate
.. //depot/projects/ia64/usr.sbin/pppd/main.c#3 integrate
.. //depot/projects/ia64/usr.sbin/sysinstall/devices.c#12 integrate

Differences ...

==== //depot/projects/ia64/bin/echo/echo.1#3 (text+ko) ====

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
-.\" $FreeBSD: src/bin/echo/echo.1,v 1.14 2003/04/12 03:49:28 tjr Exp $
+.\" $FreeBSD: src/bin/echo/echo.1,v 1.15 2003/05/08 17:47:28 schweikh Exp $
 .\"
 .Dd April 12, 2003
 .Dt ECHO 1
@@ -58,11 +58,20 @@
 The following option is available:
 .Bl -tag -width flag
 .It Fl n
-Do not print the trailing newline character.  This may also be
-achieved by appending
+Do not print the trailing newline character.
+This may also be achieved by appending
 .Ql \ec
 to the end of the string, as is done
 by iBCS2 compatible systems.
+Note that this option as well as the effect of
+.Ql \ec
+are implementation-defined in
+.St -p1003.1-2001
+as amended by Cor. 1-2002.
+Applications aiming for maximum
+portability are strongly encouraged to use
+.Xr printf 1
+to suppress the newline character.
 .El
 .Pp
 Some shells may provide a builtin

==== //depot/projects/ia64/contrib/gcc/config/i386/freebsd.h#16 (text+ko) ====

@@ -22,7 +22,7 @@
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.61 2003/04/26 19:16:54 obrien Exp $ */
+/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.62 2003/05/08 16:02:22 obrien Exp $ */
 
 #undef  CC1_SPEC
 #define CC1_SPEC "%(cc1_cpu) %{profile:-p}"
@@ -135,7 +135,7 @@
 #define FUNCTION_PROFILER(FILE, LABELNO)  \
   do {									\
     if (flag_pic)							\
-      fprintf ((FILE), "\tcall *.mcount%s at GOT(%%ebx)\n");		\
+      fprintf ((FILE), "\tcall *.mcount at GOT(%%ebx)\n");			\
     else								\
       fprintf ((FILE), "\tcall .mcount\n");				\
   } while (0)

==== //depot/projects/ia64/crypto/openssh/log.h#5 (text+ko) ====

@@ -1,4 +1,5 @@
 /*	$OpenBSD: log.h,v 1.8 2002/07/19 15:43:33 markus Exp $	*/
+/*	$FreeBSD: src/crypto/openssh/log.h,v 1.2 2003/05/12 19:22:47 des Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
@@ -53,13 +54,21 @@
 SyslogFacility	log_facility_number(char *);
 LogLevel log_level_number(char *);
 
-void     fatal(const char *, ...) __attribute__((format(printf, 1, 2)));
-void     error(const char *, ...) __attribute__((format(printf, 1, 2)));
-void     log(const char *, ...) __attribute__((format(printf, 1, 2)));
-void     verbose(const char *, ...) __attribute__((format(printf, 1, 2)));
-void     debug(const char *, ...) __attribute__((format(printf, 1, 2)));
-void     debug2(const char *, ...) __attribute__((format(printf, 1, 2)));
-void     debug3(const char *, ...) __attribute__((format(printf, 1, 2)));
+#define fatal	ssh_fatal
+#define error	ssh_error
+#define log	ssh_log
+#define verbose	ssh_verbose
+#define debug	ssh_debug
+#define debug2	ssh_debug2
+#define debug3	ssh_debug3
+
+void     ssh_fatal(const char *, ...) __attribute__((format(printf, 1, 2)));
+void     ssh_error(const char *, ...) __attribute__((format(printf, 1, 2)));
+void     ssh_log(const char *, ...) __attribute__((format(printf, 1, 2)));
+void     ssh_verbose(const char *, ...) __attribute__((format(printf, 1, 2)));
+void     ssh_debug(const char *, ...) __attribute__((format(printf, 1, 2)));
+void     ssh_debug2(const char *, ...) __attribute__((format(printf, 1, 2)));
+void     ssh_debug3(const char *, ...) __attribute__((format(printf, 1, 2)));
 
 void     fatal_cleanup(void);
 void     fatal_add_cleanup(void (*) (void *), void *);

==== //depot/projects/ia64/crypto/telnet/telnet/commands.c#9 (text+ko) ====

@@ -37,7 +37,7 @@
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/crypto/telnet/telnet/commands.c,v 1.30 2003/05/04 02:54:48 obrien Exp $");
+__FBSDID("$FreeBSD: src/crypto/telnet/telnet/commands.c,v 1.31 2003/05/11 18:17:00 markm Exp $");
 
 #include <sys/param.h>
 #include <sys/un.h>
@@ -532,11 +532,11 @@
 {
 #ifndef	NOT43
     if (net > 0 &&
-	(SetSockOpt(net, SOL_SOCKET, SO_DEBUG, debug)) < 0) {
+	(SetSockOpt(net, SOL_SOCKET, SO_DEBUG, telnet_debug)) < 0) {
 	    perror("setsockopt (SO_DEBUG)");
     }
 #else	/* NOT43 */
-    if (debug) {
+    if (telnet_debug) {
 	if (net > 0 && SetSockOpt(net, SOL_SOCKET, SO_DEBUG, 1) < 0)
 	    perror("setsockopt (SO_DEBUG)");
     } else
@@ -741,7 +741,7 @@
     { "debug",
 	"debugging",
 	    (int (*)(int))togdebug,
-		&debug,
+		&telnet_debug,
 		    "turn on socket level debugging" },
     { "netdata",
 	"printing of hexadecimal network data (debugging)",
@@ -2404,7 +2404,7 @@
 	}
 #endif	/* defined(IPPROTO_IP) && defined(IP_TOS) */
 
-	if (debug && SetSockOpt(net, SOL_SOCKET, SO_DEBUG, 1) < 0) {
+	if (telnet_debug && SetSockOpt(net, SOL_SOCKET, SO_DEBUG, 1) < 0) {
 		perror("setsockopt (SO_DEBUG)");
 	}
 

==== //depot/projects/ia64/crypto/telnet/telnet/externs.h#3 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)externs.h	8.3 (Berkeley) 5/30/95
- *	$FreeBSD: src/crypto/telnet/telnet/externs.h,v 1.9 2001/11/30 22:28:07 markm Exp $
+ *	$FreeBSD: src/crypto/telnet/telnet/externs.h,v 1.10 2003/05/11 18:17:00 markm Exp $
  */
 
 #ifndef	BSD
@@ -127,7 +127,7 @@
     netdata,		/* Print out network data flow */
     prettydump,		/* Print "netdata" output in user readable format */
     termdata,		/* Print out terminal data flow */
-    debug,		/* Debug level */
+    telnet_debug,	/* Debug level */
     doaddrlookup,	/* do a reverse lookup? */
     clienteof;		/* Client received EOF */
 

==== //depot/projects/ia64/crypto/telnet/telnet/main.c#5 (text+ko) ====

@@ -37,7 +37,7 @@
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/crypto/telnet/telnet/main.c,v 1.17 2003/05/04 02:54:48 obrien Exp $");
+__FBSDID("$FreeBSD: src/crypto/telnet/telnet/main.c,v 1.18 2003/05/11 18:17:00 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -213,7 +213,7 @@
 			skiprc = 1;
 			break;
 		case 'd':
-			debug = 1;
+			telnet_debug = 1;
 			break;
 		case 'e':
 			set_escape_char(optarg);

==== //depot/projects/ia64/crypto/telnet/telnet/telnet.c#5 (text+ko) ====

@@ -37,7 +37,7 @@
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/crypto/telnet/telnet/telnet.c,v 1.13 2003/05/04 02:54:48 obrien Exp $");
+__FBSDID("$FreeBSD: src/crypto/telnet/telnet/telnet.c,v 1.14 2003/05/11 18:17:00 markm Exp $");
 
 #include <sys/types.h>
 
@@ -95,7 +95,7 @@
 	connected,
 	showoptions,
 	ISend,		/* trying to send network data in */
-	debug = 0,
+	telnet_debug = 0,
 	crmod,
 	netdata,	/* Print out network data flow */
 	crlf,		/* Should '\r' be mapped to <CR><LF> (or <CR><NUL>)? */

==== //depot/projects/ia64/crypto/telnet/telnetd/telnetd.c#4 (text+ko) ====

@@ -37,7 +37,7 @@
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/telnetd.c,v 1.22 2003/05/04 02:54:49 obrien Exp $");
+__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/telnetd.c,v 1.23 2003/05/11 18:17:00 markm Exp $");
 
 #include "telnetd.h"
 #include "pathnames.h"
@@ -78,7 +78,7 @@
 
 int	hostinfo = 1;			/* do we print login banner? */
 
-int debug = 0;
+static int debug = 0;
 int keepalive = 1;
 const char *altlogin;
 

==== //depot/projects/ia64/etc/devd.conf#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd.conf,v 1.4 2003/05/07 15:48:20 imp Exp $
+# $FreeBSD: src/etc/devd.conf,v 1.5 2003/05/09 05:58:22 imp Exp $
 #
 # Refer to devd.conf(5) and devd(8) man pages for the details on how to
 # run and configure devd.
@@ -66,9 +66,9 @@
 # Don't even try to second guess what to do about drivers that don't
 # match here.  Instead, pass it off to syslog.  Commented out for the
 # moment, as pnpinfo isn't set in devd yet
-nomatch 0 {
-	// action "logger Unknown device: $pnpinfo $location $bus";
-};
+#nomatch 0 {
+#	action "logger Unknown device: $pnpinfo $location $bus";
+#};
 
 /* EXAMPLES TO END OF FILE
 

==== //depot/projects/ia64/etc/network.subr#3 (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.146 2003/04/18 17:51:53 mtm Exp $
+# $FreeBSD: src/etc/network.subr,v 1.147 2003/05/12 11:36:49 ume Exp $
 #
 
 #
@@ -212,3 +212,299 @@
 	esac
 	return 0			
 }
+
+hexdigit()
+{
+	if [ $1 -lt 10 ]; then
+		echo $1
+	else
+		case $1 in
+		10)	echo a ;;
+		11)	echo b ;;
+		12)	echo c ;;
+		13)	echo d ;;
+		14)	echo e ;;
+		15)	echo f ;;
+		esac
+	fi
+}
+
+hexprint()
+{
+	val=$1
+	str=''
+
+	dig=`hexdigit $((${val} & 15))`
+	str=${dig}${str}
+	val=$((${val} >> 4))
+	while [ ${val} -gt 0 ]; do
+		dig=`hexdigit $((${val} & 15))`
+		str=${dig}${str}
+		val=$((${val} >> 4))
+	done
+
+	echo ${str}
+}
+
+# Setup the interfaces for IPv6
+network6_interface_setup()
+{
+	interfaces=$*
+	rtsol_interfaces=''
+	case ${ipv6_gateway_enable} in
+	[Yy][Ee][Ss])
+		rtsol_available=no
+		;;
+	*)
+		rtsol_available=yes
+		;;
+	esac
+	for i in $interfaces; do
+		rtsol_interface=yes
+		eval prefix=\$ipv6_prefix_$i
+		if [ -n "${prefix}" ]; then
+			rtsol_available=no
+			rtsol_interface=no
+			laddr=`network6_getladdr $i`
+			hostid=`expr "${laddr}" : 'fe80::\(.*\)%\(.*\)'`
+			for j in ${prefix}; do
+				address=$j\:${hostid}
+				ifconfig $i inet6 ${address} prefixlen 64 alias
+
+				case ${ipv6_gateway_enable} in
+				[Yy][Ee][Ss])
+					# subnet-router anycast address
+					# (rfc2373)
+					ifconfig $i inet6 $j:: prefixlen 64 \
+						alias anycast
+					;;
+				esac
+			done
+		fi
+		eval ipv6_ifconfig=\$ipv6_ifconfig_$i
+		if [ -n "${ipv6_ifconfig}" ]; then
+			rtsol_available=no
+			rtsol_interface=no
+			ifconfig $i inet6 ${ipv6_ifconfig} alias
+		fi
+
+		if [ ${rtsol_available} = yes -a ${rtsol_interface} = yes ]
+		then
+			case ${i} in
+			lo0|gif[0-9]*|stf[0-9]*|faith[0-9]*|lp[0-9]*|sl[0-9]*|tun[0-9]*)
+				;;
+			*)
+				rtsol_interfaces="${rtsol_interfaces} ${i}"
+				;;
+			esac
+		else
+			ifconfig $i inet6
+		fi
+	done
+
+	if [ ${rtsol_available} = yes -a -n "${rtsol_interfaces}" ]; then
+		# Act as endhost - automatically configured.
+		# You can configure only single interface, as
+		# specification assumes that autoconfigured host has
+		# single interface only.
+		sysctl net.inet6.ip6.accept_rtadv=1
+		set ${rtsol_interfaces}
+		ifconfig $1 up
+		rtsol $1
+	fi
+
+	for i in $interfaces; do
+		alias=0
+		while : ; do
+			eval ipv6_ifconfig=\$ipv6_ifconfig_${i}_alias${alias}
+			if [ -z "${ipv6_ifconfig}" ]; then
+				break;
+			fi
+			ifconfig $i inet6 ${ipv6_ifconfig} alias
+			alias=$((${alias} + 1))
+		done
+	done
+}
+
+# Setup IPv6 to IPv4 mapping
+network6_stf_setup()
+{
+	case ${stf_interface_ipv4addr} in
+	[Nn][Oo] | '')
+		;;
+	*)
+		# assign IPv6 addr and interface route for 6to4 interface
+		stf_prefixlen=$((16+${stf_interface_ipv4plen:-0}))
+		OIFS="$IFS"
+		IFS=".$IFS"
+		set ${stf_interface_ipv4addr}
+		IFS="$OIFS"
+		hexfrag1=`hexprint $(($1*256 + $2))`
+		hexfrag2=`hexprint $(($3*256 + $4))`
+		ipv4_in_hexformat="${hexfrag1}:${hexfrag2}"
+		case ${stf_interface_ipv6_ifid} in
+		[Aa][Uu][Tt][Oo] | '')
+			for i in ${ipv6_network_interfaces}; do
+				laddr=`network6_getladdr ${i}`
+				case ${laddr} in
+				'')
+					;;
+				*)
+					break
+					;;
+				esac
+			done
+			stf_interface_ipv6_ifid=`expr "${laddr}" : \
+						      'fe80::\(.*\)%\(.*\)'`
+			case ${stf_interface_ipv6_ifid} in
+			'')
+				stf_interface_ipv6_ifid=0:0:0:1
+				;;
+			esac
+			;;
+		esac
+		ifconfig stf0 create >/dev/null 2>&1
+		ifconfig stf0 inet6 2002:${ipv4_in_hexformat}:${stf_interface_ipv6_slaid:-0}:${stf_interface_ipv6_ifid} \
+			prefixlen ${stf_prefixlen}
+		# disallow packets to malicious 6to4 prefix
+		route add -inet6 2002:e000:: -prefixlen 20 ::1 -reject
+		route add -inet6 2002:7f00:: -prefixlen 24 ::1 -reject
+		route add -inet6 2002:0000:: -prefixlen 24 ::1 -reject
+		route add -inet6 2002:ff00:: -prefixlen 24 ::1 -reject
+		;;
+	esac
+}
+
+# Setup static routes
+network6_static_routes_setup()
+{
+	# Set up any static routes.
+	case ${ipv6_defaultrouter} in
+	[Nn][Oo] | '')
+		;;
+	*)
+		ipv6_static_routes="default ${ipv6_static_routes}"
+		ipv6_route_default="default ${ipv6_defaultrouter}"
+		;;
+	esac
+	case ${ipv6_static_routes} in
+	[Nn][Oo] | '')
+		;;
+	*)
+		for i in ${ipv6_static_routes}; do
+			eval ipv6_route_args=\$ipv6_route_${i}
+			route add -inet6 ${ipv6_route_args}
+		done
+		;;
+	esac
+}
+
+# Setup faith
+network6_faith_setup()
+{
+	case ${ipv6_faith_prefix} in
+	[Nn][Oo] | '')
+		;;
+	*)
+		sysctl net.inet6.ip6.keepfaith=1
+		ifconfig faith0 create >/dev/null 2>&1
+		ifconfig faith0 up
+		for prefix in ${ipv6_faith_prefix}; do
+			prefixlen=`expr "${prefix}" : ".*/\(.*\)"`
+			case ${prefixlen} in
+			'')
+				prefixlen=96
+				;;
+			*)
+				prefix=`expr "${prefix}" : \
+					     "\(.*\)/${prefixlen}"`
+				;;
+			esac
+			route add -inet6 ${prefix} -prefixlen ${prefixlen} ::1
+			route change -inet6 ${prefix} -prefixlen ${prefixlen} \
+				-ifp faith0
+		done
+		;;
+	esac
+}
+
+# Install the "default interface" to kernel, which will be used
+# as the default route when there's no router.
+network6_default_interface_setup()
+{
+	# Choose IPv6 default interface if it is not clearly specified.
+	case ${ipv6_default_interface} in
+	'')
+		for i in ${ipv6_network_interfaces}; do
+			case $i in
+			lo0|faith[0-9]*)
+				continue
+				;;
+			esac
+			laddr=`network6_getladdr $i exclude_tentative`
+			case ${laddr} in
+			'')
+				;;
+			*)
+				ipv6_default_interface=$i
+				break
+				;;
+			esac
+		done
+		;;
+	esac
+
+	# Disallow unicast packets without outgoing scope identifiers,
+	# or route such packets to a "default" interface, if it is specified.
+	route add -inet6 fe80:: -prefixlen 10 ::1 -reject
+	case ${ipv6_default_interface} in
+	[Nn][Oo] | '')
+		route add -inet6 ff02:: -prefixlen 16 ::1 -reject
+		;;
+	*)
+		laddr=`network6_getladdr ${ipv6_default_interface}`
+		route add -inet6 ff02:: ${laddr} -prefixlen 16 -interface \
+			-cloning
+
+		# Disable installing the default interface with the
+		# case net.inet6.ip6.forwarding=0 and
+		# net.inet6.ip6.accept_rtadv=0, due to avoid conflict
+		# between the default router list and the manual
+		# configured default route.
+		case ${ipv6_gateway_enable} in
+		[Yy][Ee][Ss])
+			;;
+		*)
+			if [ `sysctl -n net.inet6.ip6.accept_rtadv` -eq 1 ]
+			then
+				ndp -I ${ipv6_default_interface}
+			fi
+			;;
+		esac
+		;;
+	esac
+}
+
+network6_getladdr()
+{
+	ifconfig $1 2>/dev/null | while read proto addr rest; do
+		case ${proto} in
+		inet6)
+			case ${addr} in
+			fe80::*)
+				if [ -z "$2" ]; then
+					echo ${addr}
+					return
+				fi
+				case ${rest} in
+				*tentative*)
+					continue
+					;;
+				*)
+					echo ${addr}
+					return
+				esac
+			esac
+		esac
+	done
+}

==== //depot/projects/ia64/etc/pccard_ether#6 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD: src/etc/pccard_ether,v 1.29 2003/05/05 19:06:46 ume Exp $
+# $FreeBSD: src/etc/pccard_ether,v 1.30 2003/05/12 11:36:49 ume Exp $
 #
 # pccard_ether interfacename [start|stop] [ifconfig option]
 #
@@ -134,8 +134,8 @@
 	# IPv6 setup
 	case ${ipv6_enable} in
 	[Yy][Ee][Ss])
-		if [ -r /etc/rc.d/network_ipv6 ]; then
-			. /etc/rc.d/network_ipv6
+		if [ -r /etc/network.subr ]; then
+			. /etc/network.subr
 			network6_interface_setup ${interface}
 		fi
 		;;

==== //depot/projects/ia64/etc/rc.d/network_ipv6#5 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.33 2003/04/29 12:08:43 jwd Exp $
+# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.34 2003/05/12 11:36:50 ume Exp $
 # 	From: src/etc/rc.network6,v 1.29 2002/04/06 15:15:43
 #
 
@@ -33,301 +33,11 @@
 # KEYWORD: FreeBSD
 
 . /etc/rc.subr
+. /etc/network.subr
 
 name="network_ipv6"
 rcvar=`set_rcvar ipv6`
 start_cmd="network_ipv6_start"
-#required_files="/etc/rc.network6"
-
-hexdigit()
-{
-	if [ $1 -lt 10 ]; then
-		echo $1
-	else
-		case $1 in
-		10)	echo a ;;
-		11)	echo b ;;
-		12)	echo c ;;
-		13)	echo d ;;
-		14)	echo e ;;
-		15)	echo f ;;
-		esac
-	fi
-}
-
-hexprint()
-{
-	val=$1
-	str=''
-
-	dig=`hexdigit $((${val} & 15))`
-	str=${dig}${str}
-	val=$((${val} >> 4))
-	while [ ${val} -gt 0 ]; do
-		dig=`hexdigit $((${val} & 15))`
-		str=${dig}${str}
-		val=$((${val} >> 4))
-	done
-
-	echo ${str}
-}
-
-network6_interface_setup()
-{
-	interfaces=$*
-	rtsol_interfaces=''
-	case ${ipv6_gateway_enable} in
-	[Yy][Ee][Ss])
-		rtsol_available=no
-		;;
-	*)
-		rtsol_available=yes
-		;;
-	esac
-	for i in $interfaces; do
-		rtsol_interface=yes
-		eval prefix=\$ipv6_prefix_$i
-		if [ -n "${prefix}" ]; then
-			rtsol_available=no
-			rtsol_interface=no
-			laddr=`network6_getladdr $i`
-			hostid=`expr "${laddr}" : 'fe80::\(.*\)%\(.*\)'`
-			for j in ${prefix}; do
-				address=$j\:${hostid}
-				ifconfig $i inet6 ${address} prefixlen 64 alias
-
-				case ${ipv6_gateway_enable} in
-				[Yy][Ee][Ss])
-					# subnet-router anycast address
-					# (rfc2373)
-					ifconfig $i inet6 $j:: prefixlen 64 \
-						alias anycast
-					;;
-				esac
-			done
-		fi
-		eval ipv6_ifconfig=\$ipv6_ifconfig_$i
-		if [ -n "${ipv6_ifconfig}" ]; then
-			rtsol_available=no
-			rtsol_interface=no
-			ifconfig $i inet6 ${ipv6_ifconfig} alias
-		fi
-
-		if [ ${rtsol_available} = yes -a ${rtsol_interface} = yes ]
-		then
-			case ${i} in
-			lo0|gif[0-9]*|stf[0-9]*|faith[0-9]*|lp[0-9]*|sl[0-9]*|tun[0-9]*)
-				;;
-			*)
-				rtsol_interfaces="${rtsol_interfaces} ${i}"
-				;;
-			esac
-		else
-			ifconfig $i inet6
-		fi
-	done
-
-	if [ ${rtsol_available} = yes -a -n "${rtsol_interfaces}" ]; then
-		# Act as endhost - automatically configured.
-		# You can configure only single interface, as
-		# specification assumes that autoconfigured host has
-		# single interface only.
-		sysctl net.inet6.ip6.accept_rtadv=1
-		set ${rtsol_interfaces}
-		ifconfig $1 up
-		rtsol $1
-	fi
-
-	for i in $interfaces; do
-		alias=0
-		while : ; do
-			eval ipv6_ifconfig=\$ipv6_ifconfig_${i}_alias${alias}
-			if [ -z "${ipv6_ifconfig}" ]; then
-				break;
-			fi
-			ifconfig $i inet6 ${ipv6_ifconfig} alias
-			alias=$((${alias} + 1))
-		done
-	done
-}
-
-network6_stf_setup()
-{
-	case ${stf_interface_ipv4addr} in
-	[Nn][Oo] | '')
-		;;
-	*)
-		# assign IPv6 addr and interface route for 6to4 interface
-		stf_prefixlen=$((16+${stf_interface_ipv4plen:-0}))
-		OIFS="$IFS"
-		IFS=".$IFS"
-		set ${stf_interface_ipv4addr}

>>> TRUNCATED FOR MAIL (1000 lines) <<<

More information about the p4-projects mailing list