Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 16 Jan 2003 15:47:59 -0800 (PST)
From:      Marcel Moolenaar <marcel@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 23818 for review
Message-ID:  <200301162347.h0GNlxJl016232@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=23818

Change 23818 by marcel@marcel_vaio on 2003/01/16 15:47:22

	IFC @23807

Affected files ...

.. //depot/projects/ia64/UPDATING#28 integrate
.. //depot/projects/ia64/bin/pax/pax.1#6 integrate
.. //depot/projects/ia64/bin/realpath/realpath.c#4 integrate
.. //depot/projects/ia64/contrib/ipfilter/ipsend/sock.c#4 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/COPYRIGHT#2 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/FREEBSD-upgrade#4 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/Makefile#2 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/Makefile.conf#4 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/Makefile.dist#3 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/README#5 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/RELNOTES#5 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/client/Makefile.dist#3 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/client/clparse.c#4 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/client/dhclient-script.8#4 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.8#3 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.c#5 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.conf.5#5 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.leases.5#3 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/client/scripts/freebsd#3 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/alloc.c#3 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/bpf.c#4 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/comapi.c#2 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/conflex.c#4 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/ctrace.c#2 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/dhcp-eval.5#3 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/dhcp-options.5#4 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/discover.c#3 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/dispatch.c#3 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/dlpi.c#2 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/dns.c#3 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/ethernet.c#3 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/execute.c#2 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/fddi.c#2 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/icmp.c#3 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/inet.c#3 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/lpf.c#3 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/memory.c#3 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/nit.c#3 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/options.c#4 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/packet.c#3 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/parse.c#4 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/print.c#5 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/raw.c#3 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/resolv.c#2 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/socket.c#3 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/tables.c#4 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/tr.c#3 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/tree.c#3 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/common/upf.c#3 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/dhcpctl/Makefile.dist#1 branch
.. //depot/projects/ia64/contrib/isc-dhcp/dhcpctl/callback.c#1 branch
.. //depot/projects/ia64/contrib/isc-dhcp/dhcpctl/cltest.c#1 branch
.. //depot/projects/ia64/contrib/isc-dhcp/dhcpctl/dhcpctl.3#1 branch
.. //depot/projects/ia64/contrib/isc-dhcp/dhcpctl/dhcpctl.c#1 branch
.. //depot/projects/ia64/contrib/isc-dhcp/dhcpctl/dhcpctl.h#1 branch
.. //depot/projects/ia64/contrib/isc-dhcp/dhcpctl/omshell.1#1 branch
.. //depot/projects/ia64/contrib/isc-dhcp/dhcpctl/omshell.c#1 branch
.. //depot/projects/ia64/contrib/isc-dhcp/dhcpctl/remote.c#1 branch
.. //depot/projects/ia64/contrib/isc-dhcp/dst/Makefile.dist#2 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/dst/dst_api.c#2 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/dst/dst_support.c#2 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/dst/hmac_link.c#2 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/dst/prandom.c#2 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/includes/dhcpd.h#5 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/includes/osdep.h#3 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/includes/version.h#5 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/minires/ns_name.c#2 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/minires/ns_samedomain.c#2 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/minires/ns_sign.c#2 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/minires/res_findzonecut.c#2 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/minires/res_send.c#2 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/omapip/alloc.c#2 integrate
.. //depot/projects/ia64/contrib/isc-dhcp/omapip/message.c#2 integrate
.. //depot/projects/ia64/etc/defaults/pccard.conf#15 integrate
.. //depot/projects/ia64/etc/defaults/rc.conf#24 integrate
.. //depot/projects/ia64/etc/mtree/BSD.x11-4.dist#4 integrate
.. //depot/projects/ia64/etc/rc.d/devd#4 integrate
.. //depot/projects/ia64/etc/rc.d/ipfw#3 integrate
.. //depot/projects/ia64/etc/rc.d/named#6 integrate
.. //depot/projects/ia64/include/rpc/rpc_com.h#4 integrate
.. //depot/projects/ia64/include/rpc/svc.h#5 integrate
.. //depot/projects/ia64/include/stdio.h#12 integrate
.. //depot/projects/ia64/lib/libc/gen/getcwd.c#4 integrate
.. //depot/projects/ia64/lib/libc/gen/unvis.c#3 integrate
.. //depot/projects/ia64/lib/libc/ia64/gen/Makefile.inc#10 integrate
.. //depot/projects/ia64/lib/libc/ia64/gen/fpgetround.c#1 branch
.. //depot/projects/ia64/lib/libc/ia64/gen/fpsetround.c#1 branch
.. //depot/projects/ia64/lib/libc/posix1e/Makefile.inc#8 integrate
.. //depot/projects/ia64/lib/libc/posix1e/mac.3#6 integrate
.. //depot/projects/ia64/lib/libc/posix1e/mac_free.3#4 integrate
.. //depot/projects/ia64/lib/libc/posix1e/mac_get.3#4 integrate
.. //depot/projects/ia64/lib/libc/posix1e/mac_is_present_np.3#4 integrate
.. //depot/projects/ia64/lib/libc/posix1e/mac_prepare.3#1 branch
.. //depot/projects/ia64/lib/libc/posix1e/mac_set.3#6 integrate
.. //depot/projects/ia64/lib/libc/posix1e/mac_text.3#6 integrate
.. //depot/projects/ia64/lib/libc/rpc/rpc_com.h#4 integrate
.. //depot/projects/ia64/lib/libc/rpc/rpc_generic.c#5 integrate
.. //depot/projects/ia64/lib/libc/rpc/svc.c#4 integrate
.. //depot/projects/ia64/lib/libc/rpc/svc_run.c#3 integrate
.. //depot/projects/ia64/lib/libc/rpc/svc_vc.c#5 integrate
.. //depot/projects/ia64/lib/libc/stdio/Makefile.inc#6 integrate
.. //depot/projects/ia64/lib/libc/stdio/ferror.3#3 integrate
.. //depot/projects/ia64/lib/libc/stdio/fileno.c#3 integrate
.. //depot/projects/ia64/lib/libc/stdio/flockfile.3#1 branch
.. //depot/projects/ia64/lib/libc/stdio/getc.3#5 integrate
.. //depot/projects/ia64/lib/libc/stdio/putc.3#5 integrate
.. //depot/projects/ia64/lib/libc/stdio/stdio.3#5 integrate
.. //depot/projects/ia64/lib/libc/stdio/unlocked.c#1 branch
.. //depot/projects/ia64/lib/libc/stdlib/realpath.3#3 integrate
.. //depot/projects/ia64/lib/libc/stdlib/realpath.c#3 integrate
.. //depot/projects/ia64/lib/libc/sys/Makefile.inc#11 integrate
.. //depot/projects/ia64/lib/libc/sys/aio_cancel.2#5 integrate
.. //depot/projects/ia64/lib/libc/sys/aio_error.2#5 integrate
.. //depot/projects/ia64/lib/libc/sys/aio_read.2#6 integrate
.. //depot/projects/ia64/lib/libc/sys/aio_return.2#5 integrate
.. //depot/projects/ia64/lib/libc/sys/aio_suspend.2#5 integrate
.. //depot/projects/ia64/lib/libc/sys/aio_write.2#5 integrate
.. //depot/projects/ia64/lib/libc/sys/lio_listio.2#1 branch
.. //depot/projects/ia64/lib/libc/sys/mount.2#5 integrate
.. //depot/projects/ia64/lib/libc/sys/read.2#4 integrate
.. //depot/projects/ia64/lib/libc/sys/sem.c#3 integrate
.. //depot/projects/ia64/lib/libc/sys/write.2#5 integrate
.. //depot/projects/ia64/lib/libc/xdr/xdr_rec.c#4 integrate
.. //depot/projects/ia64/lib/libc_r/man/sem_destroy.3#3 integrate
.. //depot/projects/ia64/lib/libc_r/man/sem_getvalue.3#3 integrate
.. //depot/projects/ia64/lib/libc_r/man/sem_init.3#2 integrate
.. //depot/projects/ia64/lib/libc_r/man/sem_open.3#2 integrate
.. //depot/projects/ia64/lib/libc_r/man/sem_post.3#2 integrate
.. //depot/projects/ia64/lib/libc_r/man/sem_wait.3#2 integrate
.. //depot/projects/ia64/lib/libc_r/uthread/uthread_init.c#10 integrate
.. //depot/projects/ia64/lib/libdisk/chunk.c#10 integrate
.. //depot/projects/ia64/lib/libdisk/create_chunk.c#11 integrate
.. //depot/projects/ia64/lib/libdisk/disk.c#15 integrate
.. //depot/projects/ia64/lib/libdisk/libdisk.h#12 integrate
.. //depot/projects/ia64/lib/libkvm/kvm_getswapinfo.c#3 integrate
.. //depot/projects/ia64/lib/libpam/modules/pam_krb5/pam_krb5.c#7 integrate
.. //depot/projects/ia64/libexec/ftpd/ftpcmd.y#11 integrate
.. //depot/projects/ia64/libexec/ftpd/ftpd.c#16 integrate
.. //depot/projects/ia64/release/Makefile#35 integrate
.. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml#6 integrate
.. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/errata/article.sgml#6 integrate
.. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml#12 integrate
.. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#13 integrate
.. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/common/intro.sgml#2 integrate
.. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.sgml#4 integrate
.. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.sgml#2 integrate
.. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.sgml#2 integrate
.. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/sparc64/Makefile#2 integrate
.. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.sgml#4 integrate
.. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.sgml#2 integrate
.. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#5 integrate
.. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#10 integrate
.. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml#7 integrate
.. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml#8 integrate
.. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/readme/article.sgml#9 integrate
.. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#19 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#8 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#5 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#18 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#35 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/intro.sgml#3 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#4 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#2 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/pc98/proc-pc98.sgml#3 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/sparc64/dev-sparc64.sgml#2 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#6 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/install.sgml#9 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#9 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml#8 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/readme/article.sgml#10 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#62 integrate
.. //depot/projects/ia64/release/doc/ja_JP.eucJP/early-adopter/article.sgml#5 integrate
.. //depot/projects/ia64/release/doc/ja_JP.eucJP/errata/article.sgml#5 integrate
.. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#6 integrate
.. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/common/intro.sgml#2 integrate
.. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml#3 integrate
.. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml#2 integrate
.. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.sgml#2 integrate
.. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml#2 integrate
.. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#14 integrate
.. //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#22 integrate
.. //depot/projects/ia64/sbin/ccdconfig/ccdconfig.8#6 integrate
.. //depot/projects/ia64/sbin/disklabel/disklabel.c#21 integrate
.. //depot/projects/ia64/sbin/dump/Makefile#6 integrate
.. //depot/projects/ia64/sbin/dump/cache.c#1 branch
.. //depot/projects/ia64/sbin/dump/dump.8#13 integrate
.. //depot/projects/ia64/sbin/dump/dump.h#12 integrate
.. //depot/projects/ia64/sbin/dump/main.c#14 integrate
.. //depot/projects/ia64/sbin/dump/traverse.c#14 integrate
.. //depot/projects/ia64/sbin/ipfw/ipfw.8#16 integrate
.. //depot/projects/ia64/sbin/ipfw/ipfw2.c#11 integrate
.. //depot/projects/ia64/sbin/mount/mount.8#9 integrate
.. //depot/projects/ia64/sbin/reboot/boot_i386.8#8 integrate
.. //depot/projects/ia64/sbin/restore/restore.8#7 integrate
.. //depot/projects/ia64/sbin/sysctl/sysctl.c#10 integrate
.. //depot/projects/ia64/share/examples/scsi_target/scsi_cmds.c#2 integrate
.. //depot/projects/ia64/share/examples/scsi_target/scsi_target.c#3 integrate
.. //depot/projects/ia64/share/man/man4/Makefile#33 integrate
.. //depot/projects/ia64/share/man/man4/aio.4#3 integrate
.. //depot/projects/ia64/share/man/man4/mac.4#1 branch
.. //depot/projects/ia64/share/man/man4/mac_biba.4#9 integrate
.. //depot/projects/ia64/share/man/man4/mac_bsdextended.4#6 integrate
.. //depot/projects/ia64/share/man/man4/mac_ifoff.4#3 integrate
.. //depot/projects/ia64/share/man/man4/mac_lomac.4#2 integrate
.. //depot/projects/ia64/share/man/man4/mac_mls.4#7 integrate
.. //depot/projects/ia64/share/man/man4/mac_none.4#4 integrate
.. //depot/projects/ia64/share/man/man4/mac_partition.4#4 integrate
.. //depot/projects/ia64/share/man/man4/mac_seeotheruids.4#4 integrate
.. //depot/projects/ia64/share/man/man4/mac_test.4#4 integrate
.. //depot/projects/ia64/share/man/man4/sem.4#1 branch
.. //depot/projects/ia64/share/man/man4/targ.4#3 integrate
.. //depot/projects/ia64/share/man/man4/wi.4#10 integrate
.. //depot/projects/ia64/share/man/man5/passwd.5#5 integrate
.. //depot/projects/ia64/share/man/man5/rc.conf.5#23 integrate
.. //depot/projects/ia64/share/man/man7/hier.7#16 integrate
.. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#14 integrate
.. //depot/projects/ia64/sys/alpha/osf1/osf1_mount.c#6 integrate
.. //depot/projects/ia64/sys/boot/common/help.common#6 integrate
.. //depot/projects/ia64/sys/boot/i386/boot2/boot2.c#15 integrate
.. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#28 integrate
.. //depot/projects/ia64/sys/cam/scsi/scsi_target.c#5 integrate
.. //depot/projects/ia64/sys/compat/linux/linux_file.c#9 integrate
.. //depot/projects/ia64/sys/compat/linux/linux_stats.c#8 integrate
.. //depot/projects/ia64/sys/compat/svr4/svr4_fcntl.c#8 integrate
.. //depot/projects/ia64/sys/compat/svr4/svr4_filio.c#8 integrate
.. //depot/projects/ia64/sys/compat/svr4/svr4_ioctl.c#7 integrate
.. //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#13 integrate
.. //depot/projects/ia64/sys/compat/svr4/svr4_socket.c#3 integrate
.. //depot/projects/ia64/sys/compat/svr4/svr4_stream.c#10 integrate
.. //depot/projects/ia64/sys/conf/NOTES#33 integrate
.. //depot/projects/ia64/sys/conf/files#56 integrate
.. //depot/projects/ia64/sys/conf/options#38 integrate
.. //depot/projects/ia64/sys/conf/options.i386#11 integrate
.. //depot/projects/ia64/sys/crypto/rc4/rc4.c#2 integrate
.. //depot/projects/ia64/sys/dev/aac/aac.c#13 integrate
.. //depot/projects/ia64/sys/dev/aac/aac_cam.c#4 integrate
.. //depot/projects/ia64/sys/dev/aac/aac_debug.c#5 integrate
.. //depot/projects/ia64/sys/dev/aac/aac_disk.c#9 integrate
.. //depot/projects/ia64/sys/dev/aac/aacreg.h#8 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpi_cpu.c#6 integrate
.. //depot/projects/ia64/sys/dev/firewire/firewire.c#11 integrate
.. //depot/projects/ia64/sys/dev/firewire/firewirereg.h#5 integrate
.. //depot/projects/ia64/sys/dev/firewire/fwdev.c#4 integrate
.. //depot/projects/ia64/sys/dev/firewire/fwohci.c#9 integrate
.. //depot/projects/ia64/sys/dev/firewire/fwohcivar.h#5 integrate
.. //depot/projects/ia64/sys/dev/firewire/iec68113.h#2 integrate
.. //depot/projects/ia64/sys/dev/md/md.c#17 integrate
.. //depot/projects/ia64/sys/dev/mii/acphy.c#7 integrate
.. //depot/projects/ia64/sys/dev/mii/miidevs#6 integrate
.. //depot/projects/ia64/sys/dev/mii/miidevs.h#6 integrate
.. //depot/projects/ia64/sys/dev/ncv/ncr53c500_pccard.c#7 integrate
.. //depot/projects/ia64/sys/dev/nge/if_nge.c#15 integrate
.. //depot/projects/ia64/sys/dev/pccard/pccarddevs#17 integrate
.. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#17 integrate
.. //depot/projects/ia64/sys/dev/pci/pci_pci.c#14 integrate
.. //depot/projects/ia64/sys/dev/pci/pcib_private.h#4 integrate
.. //depot/projects/ia64/sys/dev/sound/isa/mss.c#8 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/ich.c#10 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/ac97.c#8 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/sound.c#11 integrate
.. //depot/projects/ia64/sys/dev/streams/streams.c#6 integrate
.. //depot/projects/ia64/sys/dev/ubsec/ubsec.c#8 integrate
.. //depot/projects/ia64/sys/dev/usb/umodem.c#7 integrate
.. //depot/projects/ia64/sys/dev/usb/usb_subr.c#9 integrate
.. //depot/projects/ia64/sys/dev/wi/if_wavelan_ieee.h#10 integrate
.. //depot/projects/ia64/sys/dev/wi/if_wi.c#27 integrate
.. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#11 integrate
.. //depot/projects/ia64/sys/dev/wi/if_wi_pci.c#8 integrate
.. //depot/projects/ia64/sys/dev/wi/if_wireg.h#14 integrate
.. //depot/projects/ia64/sys/dev/wi/if_wivar.h#12 integrate
.. //depot/projects/ia64/sys/dev/wi/wi_hostap.c#14 delete
.. //depot/projects/ia64/sys/dev/wi/wi_hostap.h#6 delete
.. //depot/projects/ia64/sys/dev/xe/if_xe.c#5 integrate
.. //depot/projects/ia64/sys/dev/zs/zs.c#5 integrate
.. //depot/projects/ia64/sys/fs/devfs/devfs_rule.c#5 integrate
.. //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#21 integrate
.. //depot/projects/ia64/sys/fs/fdescfs/fdesc_vnops.c#9 integrate
.. //depot/projects/ia64/sys/fs/fifofs/fifo_vnops.c#16 integrate
.. //depot/projects/ia64/sys/fs/portalfs/portal_vfsops.c#8 integrate
.. //depot/projects/ia64/sys/fs/portalfs/portal_vnops.c#9 integrate
.. //depot/projects/ia64/sys/fs/unionfs/union_subr.c#8 integrate
.. //depot/projects/ia64/sys/geom/geom.h#18 integrate
.. //depot/projects/ia64/sys/geom/geom_bsd.c#23 integrate
.. //depot/projects/ia64/sys/geom/geom_dev.c#22 integrate
.. //depot/projects/ia64/sys/geom/geom_event.c#9 integrate
.. //depot/projects/ia64/sys/geom/geom_mbr.c#21 integrate
.. //depot/projects/ia64/sys/geom/geom_mirror.c#1 branch
.. //depot/projects/ia64/sys/i386/conf/GENERIC#28 integrate
.. //depot/projects/ia64/sys/i386/conf/NOTES#28 integrate
.. //depot/projects/ia64/sys/i386/i386/elan-mmcr.c#4 integrate
.. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#16 integrate
.. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_misc.c#7 integrate
.. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_stat.c#5 integrate
.. //depot/projects/ia64/sys/i386/isa/spkr.c#7 integrate
.. //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#19 integrate
.. //depot/projects/ia64/sys/isa/fd.c#11 integrate
.. //depot/projects/ia64/sys/isa/psm.c#7 integrate
.. //depot/projects/ia64/sys/isa/syscons_isa.c#6 integrate
.. //depot/projects/ia64/sys/kern/kern_acl.c#15 integrate
.. //depot/projects/ia64/sys/kern/kern_descrip.c#43 integrate
.. //depot/projects/ia64/sys/kern/kern_event.c#13 integrate
.. //depot/projects/ia64/sys/kern/kern_exec.c#41 integrate
.. //depot/projects/ia64/sys/kern/kern_exit.c#30 integrate
.. //depot/projects/ia64/sys/kern/kern_mac.c#16 integrate
.. //depot/projects/ia64/sys/kern/kern_sysctl.c#14 integrate
.. //depot/projects/ia64/sys/kern/kern_tc.c#18 integrate
.. //depot/projects/ia64/sys/kern/sched_4bsd.c#5 integrate
.. //depot/projects/ia64/sys/kern/subr_blist.c#4 integrate
.. //depot/projects/ia64/sys/kern/subr_bus.c#15 integrate
.. //depot/projects/ia64/sys/kern/sys_pipe.c#26 integrate
.. //depot/projects/ia64/sys/kern/sys_socket.c#14 integrate
.. //depot/projects/ia64/sys/kern/sysv_ipc.c#5 integrate
.. //depot/projects/ia64/sys/kern/sysv_shm.c#7 integrate
.. //depot/projects/ia64/sys/kern/uipc_sem.c#4 integrate
.. //depot/projects/ia64/sys/kern/uipc_socket.c#24 integrate
.. //depot/projects/ia64/sys/kern/uipc_socket2.c#19 integrate
.. //depot/projects/ia64/sys/kern/uipc_syscalls.c#23 integrate
.. //depot/projects/ia64/sys/kern/uipc_usrreq.c#19 integrate
.. //depot/projects/ia64/sys/kern/vfs_aio.c#26 integrate
.. //depot/projects/ia64/sys/kern/vfs_bio.c#36 integrate
.. //depot/projects/ia64/sys/kern/vfs_syscalls.c#34 integrate
.. //depot/projects/ia64/sys/kern/vfs_vnops.c#25 integrate
.. //depot/projects/ia64/sys/modules/Makefile#34 integrate
.. //depot/projects/ia64/sys/modules/md/Makefile#3 integrate
.. //depot/projects/ia64/sys/modules/rc4/Makefile#1 branch
.. //depot/projects/ia64/sys/modules/wi/Makefile#6 integrate
.. //depot/projects/ia64/sys/modules/wlan/Makefile#1 branch
.. //depot/projects/ia64/sys/net/if_ieee80211.h#4 integrate
.. //depot/projects/ia64/sys/net/if_ieee80211subr.c#1 branch
.. //depot/projects/ia64/sys/net/if_stf.c#12 integrate
.. //depot/projects/ia64/sys/netgraph/ng_socket.c#11 integrate
.. //depot/projects/ia64/sys/netinet/ip_fw2.c#14 integrate
.. //depot/projects/ia64/sys/netinet/tcp_input.c#31 integrate
.. //depot/projects/ia64/sys/netinet/tcp_seq.h#3 integrate
.. //depot/projects/ia64/sys/netinet/tcp_timer.c#10 integrate
.. //depot/projects/ia64/sys/netinet/tcp_var.h#8 integrate
.. //depot/projects/ia64/sys/netsmb/smb_dev.c#5 integrate
.. //depot/projects/ia64/sys/nfsserver/nfs_syscalls.c#9 integrate
.. //depot/projects/ia64/sys/opencrypto/cryptodev.c#5 integrate
.. //depot/projects/ia64/sys/pc98/conf/GENERIC#23 integrate
.. //depot/projects/ia64/sys/pc98/i386/machdep.c#30 integrate
.. //depot/projects/ia64/sys/pc98/pc98/fd.c#14 integrate
.. //depot/projects/ia64/sys/pc98/pc98/spkr.c#6 integrate
.. //depot/projects/ia64/sys/pc98/pc98/syscons_pc98.c#4 integrate
.. //depot/projects/ia64/sys/pci/agp_intel.c#8 integrate
.. //depot/projects/ia64/sys/pci/if_dc.c#22 integrate
.. //depot/projects/ia64/sys/pci/if_dcreg.h#9 integrate
.. //depot/projects/ia64/sys/pci/if_rl.c#20 integrate
.. //depot/projects/ia64/sys/pci/if_rlreg.h#7 integrate
.. //depot/projects/ia64/sys/pci/if_sis.c#14 integrate
.. //depot/projects/ia64/sys/pci/if_sisreg.h#6 integrate
.. //depot/projects/ia64/sys/pci/if_ste.c#12 integrate
.. //depot/projects/ia64/sys/pci/if_vr.c#11 integrate
.. //depot/projects/ia64/sys/pci/if_wb.c#9 integrate
.. //depot/projects/ia64/sys/pci/if_xl.c#19 integrate
.. //depot/projects/ia64/sys/pci/if_xlreg.h#6 integrate
.. //depot/projects/ia64/sys/powerpc/powerpc/openpic.c#3 integrate
.. //depot/projects/ia64/sys/powerpc/powerpc/vm_machdep.c#15 integrate
.. //depot/projects/ia64/sys/sparc64/conf/GENERIC#25 integrate
.. //depot/projects/ia64/sys/sparc64/sparc64/db_disasm.c#5 integrate
.. //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#16 integrate
.. //depot/projects/ia64/sys/sys/blist.h#5 integrate
.. //depot/projects/ia64/sys/sys/file.h#15 integrate
.. //depot/projects/ia64/sys/sys/ipc.h#6 integrate
.. //depot/projects/ia64/sys/sys/libkern.h#8 integrate
.. //depot/projects/ia64/sys/sys/namei.h#7 integrate
.. //depot/projects/ia64/sys/sys/proc.h#44 integrate
.. //depot/projects/ia64/sys/sys/shm.h#3 integrate
.. //depot/projects/ia64/sys/sys/socketvar.h#24 integrate
.. //depot/projects/ia64/sys/sys/sysctl.h#13 integrate
.. //depot/projects/ia64/sys/sys/systm.h#21 integrate
.. //depot/projects/ia64/sys/tools/devlist2h.awk#1 branch
.. //depot/projects/ia64/sys/ufs/ffs/ffs_alloc.c#16 integrate
.. //depot/projects/ia64/sys/ufs/ffs/fs.h#11 integrate
.. //depot/projects/ia64/sys/vm/vm_fault.c#25 integrate
.. //depot/projects/ia64/sys/vm/vm_map.c#41 integrate
.. //depot/projects/ia64/sys/vm/vm_meter.c#10 integrate
.. //depot/projects/ia64/sys/vm/vm_mmap.c#16 integrate
.. //depot/projects/ia64/sys/vm/vm_page.c#35 integrate
.. //depot/projects/ia64/sys/vm/vm_pageout.c#27 integrate
.. //depot/projects/ia64/sys/vm/vm_pageout.h#6 integrate
.. //depot/projects/ia64/sys/vm/vm_param.h#2 integrate
.. //depot/projects/ia64/sys/vm/vnode_pager.c#26 integrate
.. //depot/projects/ia64/tools/tools/vop_table/vop_table.tcl#3 integrate
.. //depot/projects/ia64/usr.bin/Makefile#38 integrate
.. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#22 integrate
.. //depot/projects/ia64/usr.bin/elfdump/Makefile#1 branch
.. //depot/projects/ia64/usr.bin/elfdump/elfdump.c#1 branch
.. //depot/projects/ia64/usr.bin/fstat/fstat.c#12 integrate
.. //depot/projects/ia64/usr.bin/make/var.c#12 integrate
.. //depot/projects/ia64/usr.bin/netstat/inet.c#6 integrate
.. //depot/projects/ia64/usr.bin/netstat/inet6.c#4 integrate
.. //depot/projects/ia64/usr.bin/netstat/main.c#4 integrate
.. //depot/projects/ia64/usr.bin/rpcgen/rpc_main.c#5 integrate
.. //depot/projects/ia64/usr.bin/rpcgen/rpc_svcout.c#6 integrate
.. //depot/projects/ia64/usr.bin/sockstat/sockstat.c#2 integrate
.. //depot/projects/ia64/usr.bin/systat/vmstat.c#6 integrate
.. //depot/projects/ia64/usr.bin/vmstat/vmstat.c#10 integrate
.. //depot/projects/ia64/usr.sbin/getfmac/getfmac.8#4 integrate
.. //depot/projects/ia64/usr.sbin/getpmac/Makefile#3 integrate
.. //depot/projects/ia64/usr.sbin/getpmac/getpmac.8#1 branch
.. //depot/projects/ia64/usr.sbin/inetd/inetd.c#12 integrate
.. //depot/projects/ia64/usr.sbin/mountd/mountd.c#6 integrate
.. //depot/projects/ia64/usr.sbin/pstat/pstat.c#9 integrate
.. //depot/projects/ia64/usr.sbin/rpc.lockd/lockd.c#6 integrate
.. //depot/projects/ia64/usr.sbin/rpc.statd/statd.c#3 integrate
.. //depot/projects/ia64/usr.sbin/rpc.yppasswdd/yppasswdd_main.c#5 integrate
.. //depot/projects/ia64/usr.sbin/rpcbind/rpcb_svc_com.c#5 integrate
.. //depot/projects/ia64/usr.sbin/rpcbind/rpcbind.c#9 integrate
.. //depot/projects/ia64/usr.sbin/setfmac/setfmac.8#8 integrate
.. //depot/projects/ia64/usr.sbin/setpmac/Makefile#3 integrate
.. //depot/projects/ia64/usr.sbin/setpmac/setpmac.8#1 branch
.. //depot/projects/ia64/usr.sbin/sysinstall/dist.c#15 integrate
.. //depot/projects/ia64/usr.sbin/sysinstall/help/partition.hlp#4 integrate
.. //depot/projects/ia64/usr.sbin/sysinstall/main.c#4 integrate
.. //depot/projects/ia64/usr.sbin/sysinstall/modules.c#5 integrate
.. //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.h#15 integrate
.. //depot/projects/ia64/usr.sbin/wicontrol/wicontrol.c#8 integrate

Differences ...

==== //depot/projects/ia64/UPDATING#28 (text+ko) ====

@@ -17,6 +17,11 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20030115:
+	A new version of the wi driver has been imported into the tree.
+	One now must have device wlan in the config file for it to operate
+	properly.
+
 20021222:
  	For a period after the GCC 3.2.1 import (from 12/04 to 12/22), GCC
  	used an incompatible form of ABI for returning structures and unions
@@ -1171,4 +1176,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.233 2003/01/01 18:48:38 schweikh Exp $
+$FreeBSD: src/UPDATING,v 1.234 2003/01/16 16:56:58 imp Exp $

==== //depot/projects/ia64/bin/pax/pax.1#6 (text+ko) ====

@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pax.1	8.4 (Berkeley) 4/18/94
-.\" $FreeBSD: src/bin/pax/pax.1,v 1.28 2002/10/06 07:56:27 tjr Exp $
+.\" $FreeBSD: src/bin/pax/pax.1,v 1.29 2003/01/10 17:37:23 obrien Exp $
 .\"
 .Dd April 18, 1994
 .Dt PAX 1
@@ -1064,13 +1064,13 @@
 .Pa filename .
 .Pp
 The following commands:
-.Dl mkdir /tmp/foo
-.Dl cd /tmp/bar
-.Dl pax -rw .\ /tmp/foo
+.Dl mkdir /tmp/to
+.Dl cd /tmp/from
+.Dl pax -rw .\ /tmp/to
 will copy the entire
-.Pa /tmp/bar
+.Pa /tmp/from
 directory hierarchy to
-.Pa /tmp/foo .
+.Pa /tmp/to .
 .Pp
 The command:
 .Dl pax -r -s ',^//*usr//*,,' -f a.pax

==== //depot/projects/ia64/bin/realpath/realpath.c#4 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.4 2002/12/18 11:50:28 johan Exp $");
+__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.5 2003/01/15 21:22:55 johan Exp $");
 
 #include <sys/param.h>
 
@@ -46,7 +46,7 @@
 int
 main(int argc, char *argv[])
 {
-	char buf[MAXPATHLEN];
+	char buf[PATH_MAX];
 	char *p;
 
 	if (argc == 2) {

==== //depot/projects/ia64/contrib/ipfilter/ipsend/sock.c#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/ipfilter/ipsend/sock.c,v 1.11 2002/03/19 11:48:15 darrenr Exp $ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/sock.c,v 1.13 2003/01/13 00:28:56 dillon Exp $ */
 /*
  * sock.c (C) 1995-1998 Darren Reed
  *
@@ -319,7 +319,8 @@
 	if (KMCPY(s, f->f_data, sizeof(*s)) == -1)
 	    {
 		fprintf(stderr, "read(%#lx,%#lx,%lu) - f_data - failed\n",
-			(u_long)f->f_data, (u_long)s, (u_long)sizeof(*s));
+			(u_long)f->f_data, (u_long)s,
+			(u_long)sizeof(*s));
 		return NULL;
 	    }
 

==== //depot/projects/ia64/contrib/isc-dhcp/COPYRIGHT#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996-1999 Internet Software Consortium.
+ * Copyright (c) 1996-2003 Internet Software Consortium.
  * Use is subject to license terms which appear in the file named
  * ISC-LICENSE that should have accompanied this file when you
  * received it.   If a file named ISC-LICENSE did not accompany this

==== //depot/projects/ia64/contrib/isc-dhcp/FREEBSD-upgrade#4 (text+ko) ====

@@ -1,20 +1,19 @@
 # ex:ts=8
-$FreeBSD: src/contrib/isc-dhcp/FREEBSD-upgrade,v 1.12 2002/04/01 08:44:51 murray Exp $
+$FreeBSD: src/contrib/isc-dhcp/FREEBSD-upgrade,v 1.14 2003/01/16 19:05:56 murray Exp $
 
-ISC DHCP client 3.0.1rc8
+ISC DHCP client 3.0.1rc11
 	originals can be found at: ftp://ftp.isc.org/isc/dhcp/
 
 
 For the import of ISC-dhclient the following files were removed:
 	doc/*			relay/*			server/*
-	dhcpctl/*
 
 	client/scripts/
 	bsdos			linux			netbsd
 	nextstep		solaris			openbsd
 
 	contrib/
-	dhcp.spec		solaris.init
+	dhcp.spec		solaris.init		ms2isc/
 
 	include/cf/
 	aix.h			alphaosf.h		bsdos.h
@@ -24,12 +23,12 @@
 	sample.h		sco.h			sunos4.h
 	sunos5-5.h		ultrix.h
 
-	`find . -name '.cvsignore'`
+	`find . -name '.cvsignore' -delete`
 
 Imported by:
 
-	cvs import -m 'Import ISC DHCP 3.0.1 RC8 client.' \
-		src/contrib/isc-dhcp ISC isc_dhcp_3_0_1_rc8
+	cvs import -m 'Import ISC DHCP 3.0.1 RC11 client.' \
+		src/contrib/isc-dhcp ISC isc_dhcp_3_0_1_rc11
 
 
 To make local changes to isc-dhcp, simply patch and commit to the main
@@ -60,4 +59,4 @@
 
 murray@FreeBSD.org
 obrien@NUXI.com
-01-Apr-2002
+15-Jan-2003

==== //depot/projects/ia64/contrib/isc-dhcp/Makefile#2 (text+ko) ====

@@ -1,6 +1,6 @@
 # Makefile
 #
-# Copyright (c) 2000 Internet Software Consortium.
+# Copyright (c) 2002 Internet Software Consortium.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

==== //depot/projects/ia64/contrib/isc-dhcp/Makefile.conf#4 (text+ko) ====

@@ -1,6 +1,6 @@
 # Makefile.conf
 #
-# Copyright (c) 1996-2000 Internet Software Consortium.
+# Copyright (c) 1996-2002 Internet Software Consortium.
 # Use is subject to license terms which appear in the file named
 # ISC-LICENSE that should have accompanied this file when you
 # received it.   If a file named ISC-LICENSE did not accompany this

==== //depot/projects/ia64/contrib/isc-dhcp/Makefile.dist#3 (text+ko) ====

@@ -1,6 +1,6 @@
 # Makefile.dist
 #
-# Copyright (c) 1996-1999 Internet Software Consortium.
+# Copyright (c) 1996-2002 Internet Software Consortium.
 # Use is subject to license terms which appear in the file named
 # ISC-LICENSE that should have accompanied this file when you
 # received it.   If a file named ISC-LICENSE did not accompany this

==== //depot/projects/ia64/contrib/isc-dhcp/README#5 (text+ko) ====

@@ -97,7 +97,7 @@
 
 			    RELEASE STATUS
 
-This is the ninth release candidate of version 3.0.1 of the ISC DHCP
+This is the tenth release candidate of version 3.0.1 of the ISC DHCP
 Distribution.  Development of this release is approaching the point at
 which it will be frozen, and no significant new features will be
 added.
@@ -143,14 +143,14 @@
 To build the DHCP Distribution, unpack the compressed tar file using
 the tar utility and the gzip command - type something like:
 
-	zcat dhcp-3.0.1rc9.tar.gz |tar xvf -
+	zcat dhcp-3.0.1rc11.tar.gz |tar xvf -
 
 On BSD/OS, you have to type gzcat, not zcat, and you may run into
 similar problems on other operating systems.
 
 			    CONFIGURING IT
 
-Now, cd to the dhcp-3.0.1rc9 subdirectory that you've just
+Now, cd to the dhcp-3.0.1rc11 subdirectory that you've just
 created and configure the source tree by typing:
 
 		./configure
@@ -244,16 +244,6 @@
 problems for Linux 2.1/2.2: the "SO_ATTACH_FILTER undeclared" problem
 and the "protocol not configured" problem.
 
-		       LINUX: IF_TR.H NOT FOUND
-
-When you compile the distribution on Linux, you may get an error
-message indicating that the include file if_tr.h could not be found.
-If this happens, go into includes/cf/linux.h and delete the line that
-defined HAVE_TR_SUPPORT, or look into installing a new version of libc
-that includes the if_tr.h file.   We will be working on removing this
-problem in the future, but for now, if you run into it, this should be
-a viable workaround.
-
 		  LINUX: SO_ATTACH_FILTER UNDECLARED
 
 In addition, there is a minor issue that we will mention here because

==== //depot/projects/ia64/contrib/isc-dhcp/RELNOTES#5 (text+ko) ====

@@ -1,7 +1,7 @@
 	    Internet Software Consortium DHCP Distribution
 			     Version 3.0.1
-			  Release Candidate 9
-			    April 30, 2002
+			 Release Candidate 10
+			       June, 2002
 
 			     Release Notes
 
@@ -46,6 +46,72 @@
 thanks to all of these good people here, both for working on the code
 and for prodding me into improving it.
 
+			Changes since 3.0.1rc10
+
+- Potential buffer overflows in minires repaired.
+
+- A change to the linux client script to use /bin/bash, since /bin/sh may
+  not be bash.
+
+- Some missing va_end cleanups thanks to a patch from Thomas Klausner.
+
+- A correction of boolean parsing syntax validation - some illegal syntaxes
+  that worked before are now detected and produce errs, some legal syntaxes
+  that errored before will now work properly.
+
+- Some search-and-replace errors that caused some options to change their
+  names was repaired.
+
+- Shu-min Chang of the Intel corporation has contributed a perl script and
+  module that converts the MS NT4 DHCP configuration to a ISC DHCP3
+  configuration file.
+
+- Applied the remainder of the dhcpctl memory leak patch provided by Bill
+  Squier at ReefEdge, Inc.  (groo@reefedge.com).
+
+- Missing non-optional failover peer configurations will now result in a soft
+  error rather than a null dereference.
+
+			Changes since 3.0.1rc9
+
+- A format string was corrected to fix compiler warnings.
+
+- A number of spelling corrections were made in the man pages.
+
+- The dhclient.conf.5 man page was changed to refer to do-forward-updates
+  rather than a configuration option that doesn't exist.
+
+- A FreeBSD-specific bug in the interface removal handling was fixed.
+
+- A Linux-specific Token Ring detection problem was fixed.
+
+- Hashes removed from as-yet-unknown agent options, having those options
+  appear in reality before we know about them will no longer produce
+  self-corrupting lease databases.
+
+- dhclient will use the proper port numbers now when using the -g option.
+
+- A order-of-operations bug with 2 match clauses in 1 class statement is
+  fixed thanks to a patch from Andrew Matheson.
+
+- Compilation problems on Solaris were fixed.
+
+- Compilation problems when built with DEBUG or DEBUG_PACKET were repaired.
+
+- A fix to the dhcp ack process which makes certain group options will be
+  included in the first DHCPOFFER message was made thanks to a patch from
+  Ling Gou.
+
+- A few memory leaks were repaired thanks to patches from Bill Squier at
+  ReefEdge, Inc.  (groo@reefedge.com).
+
+- A fix for shared-networks that sometimes give clients options for the
+  wrong subnets (in particular, 'option routers') was applied, thanks to
+  Ted Lemon for the patch.
+
+- Omshell's handling of dotted octets as values was changed such that dots
+  one after the other produce zero values in the integer string.
+
 			Changes since 3.0.1rc8
 
 - Fix a format string vulnerability in the server that could lead to a

==== //depot/projects/ia64/contrib/isc-dhcp/client/Makefile.dist#3 (text+ko) ====

@@ -1,6 +1,6 @@
 # Makefile.dist
 #
-# Copyright (c) 1996-1999 Internet Software Consortium.
+# Copyright (c) 1996-2002 Internet Software Consortium.
 # Use is subject to license terms which appear in the file named
 # ISC-LICENSE that should have accompanied this file when you
 # received it.   If a file named ISC-LICENSE did not accompany this

==== //depot/projects/ia64/contrib/isc-dhcp/client/clparse.c#4 (text+ko) ====

@@ -43,8 +43,8 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: clparse.c,v 1.62.2.2 2002/02/09 03:13:17 mellon Exp $ Copyright (c) 1996-2001 The Internet Software Consortium.  All rights reserved.\n"
-"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.8 2002/04/01 07:59:50 murray Exp $\n";
+"$Id: clparse.c,v 1.62.2.3 2002/11/17 02:25:43 dhankins Exp $ Copyright (c) 1996-2002 The Internet Software Consortium.  All rights reserved.\n"
+"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.9 2003/01/16 07:22:32 obrien Exp $\n";
 #endif /* not lint */
 
 #include "dhcpd.h"

==== //depot/projects/ia64/contrib/isc-dhcp/client/dhclient-script.8#4 (text+ko) ====

@@ -1,6 +1,6 @@
 .\"	dhclient-script.8
 .\"
-.\" Copyright (c) 1996-2001 Internet Software Consortium.
+.\" Copyright (c) 1996-2002 Internet Software Consortium.
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -35,7 +35,8 @@
 .\" see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
 .\" ``http://www.nominum.com''.
 .\"
-.\" $FreeBSD: src/contrib/isc-dhcp/client/dhclient-script.8,v 1.8 2002/09/30 08:45:13 murray Exp $
+.\" $Id: dhclient-script.8,v 1.8.2.4 2002/11/17 02:25:43 dhankins Exp $
+.\" $FreeBSD: src/contrib/isc-dhcp/client/dhclient-script.8,v 1.10 2003/01/16 07:23:57 obrien Exp $
 .\"
 .TH dhclient-script 8
 .SH NAME

==== //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.8#3 (text+ko) ====

@@ -1,6 +1,6 @@
 .\"	dhclient.8
 .\"
-.\" Copyright (c) 1996-1999 Internet Software Consortium.
+.\" Copyright (c) 1996-2002 Internet Software Consortium.
 .\" Use is subject to license terms which appear in the file named
 .\" ISC-LICENSE that should have accompanied this file when you
 .\" received it.   If a file named ISC-LICENSE did not accompany this
@@ -16,9 +16,11 @@
 .\" Support and other services are available for ISC products - see
 .\" http://www.isc.org for more information.
 .\"
+.\" $Id: dhclient.8,v 1.12.2.7 2002/11/17 02:25:43 dhankins Exp $
+.\"
 .\" Portions copyright (c) 2000 David E. O'Brien.
 .\" All rights reserved.
-.\" $FreeBSD: src/contrib/isc-dhcp/client/dhclient.8,v 1.10 2002/02/19 12:00:47 murray Exp $
+.\" $FreeBSD: src/contrib/isc-dhcp/client/dhclient.8,v 1.12 2003/01/16 07:28:12 obrien Exp $
 .\"
 .TH dhclient 8
 .SH NAME
@@ -143,7 +145,7 @@
 The names of the network interfaces that dhclient should attempt to
 configure may be specified on the command line.  If no interface names
 are specified on the command line dhclient will normally identify all
-network interfaces, elimininating non-broadcast interfaces if
+network interfaces, eliminating non-broadcast interfaces if
 possible, and attempt to configure each interface.
 .PP
 It is also possible to specify interfaces by name in the

==== //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.c#5 (text+ko) ====

@@ -41,8 +41,8 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$Id: dhclient.c,v 1.129.2.10 2002/04/26 23:33:05 murray Exp $ Copyright (c) 1995-2001 Internet Software Consortium.  All rights reserved.\n"
-"$FreeBSD: src/contrib/isc-dhcp/client/dhclient.c,v 1.22 2002/09/30 08:45:13 murray Exp $\n";
+"$Id: dhclient.c,v 1.129.2.12 2002/11/07 23:26:38 dhankins Exp $ Copyright (c) 1995-2002 Internet Software Consortium.  All rights reserved.\n"
+"$FreeBSD: src/contrib/isc-dhcp/client/dhclient.c,v 1.23 2003/01/15 10:44:05 murray Exp $\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -72,20 +72,19 @@
    assert (state_is == state_shouldbe). */
 #define ASSERT_STATE(state_is, state_shouldbe) {}
 
-static char copyright[] = "Copyright 1995-2001 Internet Software Consortium.";
+static char copyright[] = "Copyright 1995-2002 Internet Software Consortium.";
 static char arr [] = "All rights reserved.";
 static char message [] = "Internet Software Consortium DHCP Client";
 static char url [] = "For info, please visit http://www.isc.org/products/DHCP";
 
-u_int16_t local_port;
-u_int16_t remote_port;
-int no_daemon;
-int save_scripts;
-struct string_list *client_env;
-int client_env_count;
-int onetry;
-int quiet = 1;
-int nowait;
+u_int16_t local_port=0;
+u_int16_t remote_port=0;
+int no_daemon=0;
+struct string_list *client_env=NULL;
+int client_env_count=0;
+int onetry=0;
+int quiet=1;
+int nowait=0;
 
 static void usage PROTO ((void));
 
@@ -291,8 +290,10 @@
 
 	/* Default to the DHCP/BOOTP port. */
 	if (!local_port) {
+		/* If we're faking a relay agent, and we're not using loopback,
+		   use the server port, not the client port. */
 		if (relay && giaddr.s_addr != htonl (INADDR_LOOPBACK)) {
-			local_port = htons (67);
+			local_port = htons(67);
 		} else {
 			ent = getservbyname ("dhcpc", "udp");
 			if (!ent)
@@ -306,13 +307,12 @@
 	}
 
 	/* If we're faking a relay agent, and we're not using loopback,
-	   use the server port, not the client port. */
+	   we're using the server port, not the client port. */
 	if (relay && giaddr.s_addr != htonl (INADDR_LOOPBACK)) {
-		local_port = htons (ntohs (local_port) - 1);
 		remote_port = local_port;
 	} else
 		remote_port = htons (ntohs (local_port) - 1);	/* XXX */
-  
+
 	/* Get the current time... */
 	GET_TIME (&cur_time);
 

==== //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.conf.5#5 (text+ko) ====

@@ -1,6 +1,6 @@
 .\"	dhclient.conf.5
 .\"
-.\" Copyright (c) 1996-2001 Internet Software Consortium.
+.\" Copyright (c) 1996-2002 Internet Software Consortium.
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -35,7 +35,8 @@
 .\" see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
 .\" ``http://www.nominum.com''.
 .\"
-.\" $FreeBSD: src/contrib/isc-dhcp/client/dhclient.conf.5,v 1.10 2002/09/30 08:45:13 murray Exp $
+.\" $Id: dhclient.conf.5,v 1.12.2.8 2002/11/17 02:25:43 dhankins Exp $
+.\" $FreeBSD: src/contrib/isc-dhcp/client/dhclient.conf.5,v 1.12 2003/01/16 07:31:49 obrien Exp $
 .\"
 .TH dhclient.conf 5
 .SH NAME
@@ -252,19 +253,19 @@
 \fIon\fR or \fIoff\fR, depending on the DHCP server you are using.
 .PP
 .I The
-.B no-client-updates
+.B do-forward-updates
 .I statement
 .PP
- \fBno-client-updates [ \fIflag\fR ] \fB;\fR
+ \fBdo-forward-updates [ \fIflag\fR ] \fB;\fR
 .PP
 If you want to do DNS updates in the DHCP client
 script (see \fBdhclient-script(8)\fR) rather than having the
 DHCP client do the update directly (for example, if you want to
 use SIG(0) authentication, which is not supported directly by the
 DHCP client, you can instruct the client not to do the update using
-the \fBno-client-updates\fR statement.   \fIFlag\fR should be \fBtrue\fR
-if you don't want the DHCP client to do the update, and \fBfalse\fR if
-you want the DHCP client to do the update.   By default, the DHCP
+the \fBdo-forward-updates\fR statement.   \fIFlag\fR should be \fBtrue\fR
+if you want the DHCP client to do the update, and \fBfalse\fR if
+you don't want the DHCP client to do the update.   By default, the DHCP
 client will do the DNS update.
 .SH OPTION MODIFIERS
 In some cases, a client may receive option data from the server which

==== //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.leases.5#3 (text+ko) ====

@@ -1,6 +1,6 @@
 .\"	dhclient.conf.5
 .\"
-.\" Copyright (c) 1997 The Internet Software Consortium.
+.\" Copyright (c) 1997-2002 The Internet Software Consortium.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,8 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.\" $FreeBSD: src/contrib/isc-dhcp/client/dhclient.leases.5,v 1.3 2002/02/19 12:43:18 murray Exp $
+.\" $Id: dhclient.leases.5,v 1.2.4.3 2002/11/17 02:25:44 dhankins Exp $
+.\" $FreeBSD: src/contrib/isc-dhcp/client/dhclient.leases.5,v 1.5 2003/01/16 07:36:45 obrien Exp $
 .\"
 .TH dhclient.leases 5
 .SH NAME

==== //depot/projects/ia64/contrib/isc-dhcp/client/scripts/freebsd#3 (text+ko) ====

@@ -1,7 +1,9 @@
 #!/bin/sh
+#
+# $Id: freebsd,v 1.13.2.4 2002/06/09 22:37:55 murray Exp $
+#
+# $FreeBSD: src/contrib/isc-dhcp/client/scripts/freebsd,v 1.21 2003/01/15 10:47:32 murray Exp $
 
-# $FreeBSD: src/contrib/isc-dhcp/client/scripts/freebsd,v 1.20 2002/02/19 12:10:40 murray Exp $
-
 if [ -x /usr/bin/logger ]; then
 	LOGGER="/usr/bin/logger -s -p user.notice -t dhclient"
 else
@@ -9,8 +11,12 @@
 fi
 
 make_resolv_conf() {
-  if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then
-    echo search $new_domain_name >/etc/resolv.conf
+  if [ x"$new_domain_name_servers" != x ]; then
+    if [ "x$new_domain_name" != x ]; then
+      echo search $new_domain_name >/etc/resolv.conf
+    else
+      rm /etc/resolv.conf
+    fi
     for nameserver in $new_domain_name_servers; do
       echo nameserver $nameserver >>/etc/resolv.conf
     done

==== //depot/projects/ia64/contrib/isc-dhcp/common/alloc.c#3 (text+ko) ====

@@ -3,7 +3,7 @@
    Memory allocation... */
 
 /*
- * Copyright (c) 1996-2001 Internet Software Consortium.
+ * Copyright (c) 1996-2002 Internet Software Consortium.
  * All rights reserved.

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

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200301162347.h0GNlxJl016232>