PERFORCE change 27454 for review
Robert Watson
rwatson at freebsd.org
Thu Mar 27 04:48:21 GMT 2003
http://perforce.freebsd.org/chv.cgi?CH=27454
Change 27454 by rwatson at rwatson_tislabs on 2003/03/26 20:47:46
Integ TrustedBSD base branch for more merge-work: loop back
ipq entry point changes, etc.
Affected files ...
.. //depot/projects/trustedbsd/base/contrib/gcc/FAQ#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/GNATS#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/MAINTAINERS#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/bugs.html#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config-ml.in#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config.if#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config.sub#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/ChangeLog#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/acinclude.m4#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-a68bsd#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-aix386#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-apollo68#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-armpic#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-cxux#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-cygwin#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-decstation#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-delta88#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-dgux#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-dgux386#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-djgpp#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-elfalphapic#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-hp300#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-hpux#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-hpux8#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-i370pic#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-ia64pic#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-interix#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-irix4#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-irix5#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-irix6#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-lynxos#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-lynxrs6k#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-m68kpic#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-mingw32#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-ncr3000#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-ncrsvr43#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-necv4#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-openedition#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-papic#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-ppcpic#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-riscos#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-sco#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-solaris#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-sparcpic#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-sun3#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-sysv#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-sysv4#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-sysv5#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-vaxult2#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mh-x86pic#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw-mh-mpw#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw/ChangeLog#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw/MoveIfChange#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw/README#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw/forward-include#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw/g-mpw-make.sed#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw/mpw-touch#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw/mpw-true#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw/null-command#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw/open-brace#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw/tr-7to8-src#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mpw/true#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-aix43#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-alphaieee#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-armpic#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-d30v#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-elfalphapic#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-i370pic#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-ia64pic#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-linux#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-m68kpic#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-netware#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-ospace#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-papic#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-ppcpic#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-sparcpic#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-v810#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-wince#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/mt-x86pic#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/contrib/ChangeLog#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/contrib/analyze_brprob#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/contrib/compare_tests#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/contrib/convert_to_f2c#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/contrib/convert_to_g2c#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/contrib/download_f2c#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/contrib/gcc_build#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/contrib/gcc_update#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/contrib/gccbug.el#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/contrib/gennews#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/contrib/index-prop#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/contrib/newcvsroot#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/contrib/regression/ChangeLog#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/contrib/regression/README#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/contrib/regression/btest-gcc.sh#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/contrib/regression/objs-gcc.sh#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/contrib/regression/site.exp#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/contrib/test_installed#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/contrib/test_summary#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/contrib/texi2pod.pl#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/contrib/warn_summary#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/faq.html#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/gnats.html#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/include/COPYING#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/include/ChangeLog#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/include/ansidecl.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/include/demangle.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/include/dyn-string.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/include/fibheap.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/include/floatformat.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/include/fnmatch.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/include/getopt.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/include/hashtab.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/include/libiberty.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/include/md5.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/include/objalloc.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/include/obstack.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/include/partition.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/include/safe-ctype.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/include/sort.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/include/splay-tree.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/include/symcat.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/include/ternary.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/include/xregex.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/include/xregex2.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/install-sh#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/libtool.m4#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/ltcf-c.sh#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/ltcf-cxx.sh#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/ltcf-gcj.sh#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/ltconfig#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/ltmain.sh#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/missing#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/mkdep#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/mkinstalldirs#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/symlink-tree#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/ylwrap#2 delete
.. //depot/projects/trustedbsd/base/contrib/gdtoa/README#2 integrate
.. //depot/projects/trustedbsd/base/contrib/gdtoa/g__fmt.c#2 integrate
.. //depot/projects/trustedbsd/base/contrib/gdtoa/gethex.c#2 integrate
.. //depot/projects/trustedbsd/base/contrib/gdtoa/strtod.c#2 integrate
.. //depot/projects/trustedbsd/base/contrib/gdtoa/strtodg.c#2 integrate
.. //depot/projects/trustedbsd/base/contrib/gdtoa/xsum0.out#2 integrate
.. //depot/projects/trustedbsd/base/etc/printcap#4 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/send-pr/send-pr.1#5 integrate
.. //depot/projects/trustedbsd/base/lib/libatm/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/lib/libatm/atm_addr.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libatm/cache_key.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libatm/ip_addr.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libatm/libatm.h#3 integrate
.. //depot/projects/trustedbsd/base/lib/libatm/timer.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/_spinlock_stub.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/include/spinlock.h#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_spinlock.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_spinlock.c#2 integrate
.. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.8#10 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#61 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/ilmid/ilmid.c#6 integrate
.. //depot/projects/trustedbsd/base/sbin/dhclient/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/sbin/dhclient/Makefile.inc#3 integrate
.. //depot/projects/trustedbsd/base/sbin/dhclient/dhcpctl/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sbin/dhclient/omshell/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sbin/init/init.8#6 integrate
.. //depot/projects/trustedbsd/base/sbin/ip6fw/ip6fw.c#5 integrate
.. //depot/projects/trustedbsd/base/sbin/mknod/mknod.8#6 integrate
.. //depot/projects/trustedbsd/base/share/examples/cvsup/refuse#4 integrate
.. //depot/projects/trustedbsd/base/share/examples/cvsup/refuse.README#5 integrate
.. //depot/projects/trustedbsd/base/share/examples/ppp/ppp.conf.sample#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/amr.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/bge.4#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ccd.4#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/iir.4#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/intro.4#7 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/kld.4#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/cx.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/dgb.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/pcm.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/tap.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/tun.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ukbd.4#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/urio.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#24 integrate
.. //depot/projects/trustedbsd/base/share/man/man8/MAKEDEV.8#1 branch
.. //depot/projects/trustedbsd/base/share/man/man8/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/Makefile#25 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/at_exit.9#2 delete
.. //depot/projects/trustedbsd/base/share/man/man9/at_fork.9#4 delete
.. //depot/projects/trustedbsd/base/share/man/man9/style.9#18 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_sysvec.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_cd.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/compat/linux/linux_mib.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/compat/linux/linux_mib.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/conf/NOTES#31 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files#56 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.pc98#26 integrate
.. //depot/projects/trustedbsd/base/sys/conf/options#33 integrate
.. //depot/projects/trustedbsd/base/sys/conf/options.i386#14 integrate
.. //depot/projects/trustedbsd/base/sys/conf/options.pc98#15 integrate
.. //depot/projects/trustedbsd/base/sys/dev/aac/aac.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/aac/aac_cam.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/aac/aac_pci.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/dev/aac/aacreg.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/aac/aacvar.h#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.reg#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/ispmbox.h#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via8233.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via82c686.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via82c686.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/geom/bde/g_bde_lock.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom.h#22 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_subr.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/i386/bios/apm.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/bios/apm.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#30 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#35 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/SMP#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/smp.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/i386/linux/linux_machdep.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysvec.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/isa/orm.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/kern/bus_if.m#7 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#39 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_malloc.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_subr.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#38 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/modules/apm/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_output.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/nd6_rtr.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_lock.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_socket.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/apm/apm.c#9 delete
.. //depot/projects/trustedbsd/base/sys/pc98/apm/apm.h#2 delete
.. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_lomac/mac_lomac.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_none/mac_none.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_test/mac_test.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/tte.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/pci/ofw_pci.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/tsb.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mac.h#27 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#26 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#20 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mount.h#17 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_rawread.c#1 branch
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vnops.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/vm/uma_core.c#19 integrate
.. //depot/projects/trustedbsd/base/usr.bin/at/at.man#10 integrate
.. //depot/projects/trustedbsd/base/usr.bin/netstat/netstat.1#2 integrate
.. //depot/projects/trustedbsd/base/usr.bin/su/su.c#14 integrate
.. //depot/projects/trustedbsd/base/usr.bin/whois/whois.c#9 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ppp/bundle.h#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ppp/command.c#10 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ppp/datalink.c#7 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ppp/ip.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ppp/ipv6cp.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ppp/ncpaddr.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ppp/ppp.8.m4#12 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ppp/route.c#8 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/rtadvd/rtadvd.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/setfmac/setfsmac.8#2 integrate
Differences ...
==== //depot/projects/trustedbsd/base/contrib/gdtoa/README#2 (text+ko) ====
@@ -320,7 +320,4 @@
Please send comments to
David M. Gay
- Bell Labs, Room 2C-463
- 600 Mountain Avenue
- Murray Hill, NJ 07974-0636, U.S.A.
- dmg at research.bell-labs.com
+ dmg at acm.org
==== //depot/projects/trustedbsd/base/contrib/gdtoa/g__fmt.c#2 (text+ko) ====
@@ -28,11 +28,7 @@
/* Please send bug reports to
David M. Gay
- Bell Laboratories, Room 2C-463
- 600 Mountain Avenue
- Murray Hill, NJ 07974-0636
- U.S.A.
- dmg at bell-labs.com
+ dmg at acm.org
*/
#include "gdtoaimp.h"
==== //depot/projects/trustedbsd/base/contrib/gdtoa/gethex.c#2 (text+ko) ====
@@ -28,15 +28,15 @@
/* Please send bug reports to
David M. Gay
- Bell Laboratories, Room 2C-463
- 600 Mountain Avenue
- Murray Hill, NJ 07974-0636
- U.S.A.
- dmg at bell-labs.com
+ dmg at acm.org
*/
#include "gdtoaimp.h"
+#ifdef USE_LOCALE
+#include "locale.h"
+#endif
+
int
#ifdef KR_headers
gethex(sp, fpi, exp, bp, sign)
@@ -50,6 +50,11 @@
int esign, havedig, irv, k, n, nbits, up;
ULong L, lostbits, *x;
Long e, e1;
+#ifdef USE_LOCALE
+ char decimalpoint = *localeconv()->decimal_point;
+#else
+#define decimalpoint '.'
+#endif
if (!hexdig['0'])
hexdig_init_D2A();
@@ -61,7 +66,7 @@
s = s0;
decpt = 0;
if (!hexdig[*s]) {
- if (*s == '.') {
+ if (*s == decimalpoint) {
decpt = ++s;
if (!hexdig[*s])
goto ret0;
@@ -80,7 +85,7 @@
}
while(hexdig[*s])
s++;
- if (*s == '.' && !decpt) {
+ if (*s == decimalpoint && !decpt) {
decpt = ++s;
while(hexdig[*s])
s++;
@@ -120,7 +125,7 @@
n = 0;
L = 0;
while(s1 > s0) {
- if (*--s1 == '.')
+ if (*--s1 == decimalpoint)
continue;
if (n == 32) {
*x++ = L;
==== //depot/projects/trustedbsd/base/contrib/gdtoa/strtod.c#2 (text+ko) ====
@@ -28,11 +28,7 @@
/* Please send bug reports to
David M. Gay
- Bell Laboratories, Room 2C-463
- 600 Mountain Avenue
- Murray Hill, NJ 07974-0636
- U.S.A.
- dmg at bell-labs.com
+ dmg at acm.org
*/
#include "gdtoaimp.h"
@@ -118,7 +114,7 @@
switch(s[1]) {
case 'x':
case 'X':
- switch(gethex(&s, &fpi, &exp, &bb, sign)) {
+ switch(i = gethex(&s, &fpi, &exp, &bb, sign)) {
case STRTOG_NoNumber:
s = s00;
sign = 0;
==== //depot/projects/trustedbsd/base/contrib/gdtoa/strtodg.c#2 (text+ko) ====
@@ -28,11 +28,7 @@
/* Please send bug reports to
David M. Gay
- Bell Laboratories, Room 2C-463
- 600 Mountain Avenue
- Murray Hill, NJ 07974-0636
- U.S.A.
- dmg at bell-labs.com
+ dmg at acm.org
*/
#include "gdtoaimp.h"
==== //depot/projects/trustedbsd/base/contrib/gdtoa/xsum0.out#2 (text+ko) ====
@@ -1,9 +1,9 @@
-README 7150e50 13249
+README c9c34c1 13153
arithchk.c e37b8a75 4070
dmisc.c e8d262b6 4712
dtoa.c f3c132b3 16905
g_Qfmt.c e5847e9 2870
-g__fmt.c e29d67f1 2534
+g__fmt.c ee5f9be0 2439
g_ddfmt.c fcf94527 3790
g_dfmt.c f30e55a9 2533
g_ffmt.c 7c4ea96 2459
@@ -12,7 +12,7 @@
gdtoa.c 364a0d2 17017
gdtoa.h 1eb440de 4810
gdtoaimp.h 6a955ba 19106
-gethex.c ff3c434d 4981
+gethex.c 1310d1b3 5066
gmisc.c e1a268ea 2114
hd_init.c cf9a94e 1827
hexnan.c f53be1da 2988
@@ -26,9 +26,9 @@
strtoIg.c ec59c2fa 3484
strtoIx.c 8f8c9d 1990
strtoIxL.c 1313ff7f 1961
-strtod.c 1ad667 20076
+strtod.c fd6556c8 19985
strtodI.c e58338e0 4062
-strtodg.c 1caf3fa4 19553
+strtodg.c e04b9254 19458
strtof.c 1e7a787a 2202
strtopQ.c e232c542 2685
strtopd.c e865dc64 1701
==== //depot/projects/trustedbsd/base/etc/printcap#4 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)printcap 5.3 (Berkeley) 6/30/90
-# $FreeBSD: src/etc/printcap,v 1.12 2002/07/31 10:05:37 blackend Exp $
+# $FreeBSD: src/etc/printcap,v 1.13 2003/03/25 18:03:11 trhodes Exp $
#
# This enables a simple local "raw" printer, hooked up to the first
@@ -22,7 +22,7 @@
#
# Do also refer to the "printing" section of the handbook.
#
-# http://www.freebsd.org/doc/handbook/printing.html
+# http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/printing.html
#
# A local copy can be found under
#
==== //depot/projects/trustedbsd/base/gnu/usr.bin/send-pr/send-pr.1#5 (text+ko) ====
@@ -22,7 +22,7 @@
.\"
.\" ---------------------------------------------------------------------------
.\"
-.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.14 2002/08/13 10:30:55 blackend Exp $
+.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.15 2003/03/26 01:45:20 keramida Exp $
.nh
.TH SEND-PR 1 3.113 "February 1993"
.SH NAME
@@ -228,6 +228,19 @@
default:
.B vi
.sp
+If the environment variable
+.B MAIL_AGENT
+is set, its value is used as the path + command line arguments of the
+executable to be invoked for sending the problem report (which will be
+provided via standard input).
+.br
+This can be useful if you either use a MTA other than sendmail or need
+to provide additional parameters, such as the envelope sender on
+machines without a valid FQDN.
+.br
+Default value:
+.B /usr/sbin/sendmail -oi -t
+.sp
If the environment variable
.B PR_FORM
is set, then its value is used as the file name of the template for
==== //depot/projects/trustedbsd/base/lib/libatm/Makefile#2 (text+ko) ====
@@ -23,7 +23,7 @@
# Copies of this Software may be made, however, the above copyright
# notice must be reproduced on all copies.
#
-# @(#) $FreeBSD: src/lib/libatm/Makefile,v 1.4 2000/01/14 07:57:22 rgrimes Exp $
+# @(#) $FreeBSD: src/lib/libatm/Makefile,v 1.6 2003/03/25 17:40:00 mdodd Exp $
#
#
@@ -33,5 +33,6 @@
LDADD+= -lmd
DPADD+= ${LIBMD}
+WARNS?= 3
.include <bsd.lib.mk>
==== //depot/projects/trustedbsd/base/lib/libatm/atm_addr.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libatm/atm_addr.c,v 1.8 2002/06/24 22:29:01 arr Exp $");
+__FBSDID("$FreeBSD: src/lib/libatm/atm_addr.c,v 1.9 2003/03/25 04:29:26 mdodd Exp $");
#ifndef lint
#if 0 /* original (broken) import id */
static char *RCSid = "@(#) $Id: atm_addr.c,v 1.1 1998/07/09 21:45:18 johnc Exp $";
@@ -183,6 +183,10 @@
val += c_value;
out[out_len] = (u_char) val;
out_len++;
+ if (out_len > len)
+ (void)fprintf(stderr, "%s() out_len > len (%d > %d)\n",
+ __func__, out_len, len);
+
break;
case 4:
@@ -305,7 +309,8 @@
u2.c[3] = atm_spans->aas_addr[7];
if (!(u1.w == 0 && u2.w == 0))
- sprintf(str, "0x%08lx.%08lx", ntohl(u1.w), ntohl(u2.w));
+ sprintf(str, "0x%08lx.%08lx",
+ (u_long)ntohl(u1.w), (u_long)ntohl(u2.w));
break;
case T_ATM_PVC_ADDR:
==== //depot/projects/trustedbsd/base/lib/libatm/cache_key.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libatm/cache_key.c,v 1.7 2002/06/24 22:29:01 arr Exp $");
+__FBSDID("$FreeBSD: src/lib/libatm/cache_key.c,v 1.8 2003/03/25 04:29:26 mdodd Exp $");
/*
* User Space Library Functions
@@ -85,7 +85,7 @@
* Copy the addresses into a buffer for MD5 computation
*/
len = sizeof(struct in_addr) + ap->address_length;
- if (len > sizeof(buff))
+ if (len > (int)sizeof(buff))
len = sizeof(buff);
bcopy(ip, buff, sizeof(struct in_addr));
bcopy(ap->address, &buff[sizeof(struct in_addr)],
==== //depot/projects/trustedbsd/base/lib/libatm/ip_addr.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libatm/ip_addr.c,v 1.7 2002/06/24 22:29:01 arr Exp $");
+__FBSDID("$FreeBSD: src/lib/libatm/ip_addr.c,v 1.8 2003/03/25 04:29:26 mdodd Exp $");
/*
* User Space Library Functions
@@ -73,18 +73,18 @@
char *p;
{
struct hostent *ip_host;
- static struct sockaddr_in sin;
+ static struct sockaddr_in s;
/*
* Get IP address of specified host name
*/
- bzero(&sin, sizeof(sin));
- sin.sin_family = AF_INET;
+ bzero(&s, sizeof(s));
+ s.sin_family = AF_INET;
if (p[0] >= '0' && p[0] <= '9') {
/*
* IP address is in dotted decimal format
*/
- if ((sin.sin_addr.s_addr = inet_addr(p)) == -1) {
+ if ((s.sin_addr.s_addr = inet_addr(p)) == INADDR_NONE) {
return((struct sockaddr_in *)0);
}
} else {
@@ -96,9 +96,9 @@
ip_host->h_addrtype != AF_INET) {
return((struct sockaddr_in *)0);
}
- sin.sin_addr.s_addr = *(u_long *)ip_host->h_addr_list[0];
+ s.sin_addr.s_addr = *(u_long *)ip_host->h_addr_list[0];
}
- return(&sin);
+ return(&s);
}
@@ -115,7 +115,7 @@
* char * pointer to a text-formatted string
*
*/
-char *
+const char *
format_ip_addr(addr)
struct in_addr *addr;
{
==== //depot/projects/trustedbsd/base/lib/libatm/libatm.h#3 (text+ko) ====
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $FreeBSD: src/lib/libatm/libatm.h,v 1.5 2002/03/22 09:22:15 obrien Exp $
+ * @(#) $FreeBSD: src/lib/libatm/libatm.h,v 1.6 2003/03/25 04:29:26 mdodd Exp $
*
*/
@@ -71,7 +71,7 @@
struct harp_timer *ht_next; /* Timer chain */
int ht_ticks; /* Seconds till exp */
int ht_mark; /* Processing flag */
- void (*ht_func)(); /* Function to call */
+ void (*ht_func)(struct harp_timer *); /* Function to call */
};
typedef struct harp_timer Harp_timer;
@@ -100,7 +100,7 @@
/* ip_addr.c */
extern struct sockaddr_in *get_ip_addr(char *);
-extern char *format_ip_addr(struct in_addr *);
+extern const char *format_ip_addr(struct in_addr *);
/* ip_checksum.c */
extern short ip_checksum(char *, int);
@@ -108,9 +108,9 @@
/* timer.c */
extern Harp_timer *harp_timer_head;
extern int harp_timer_exec;
-extern void timer_proc();
-extern int init_timer();
-extern int block_timer();
+extern void timer_proc(void);
+extern int init_timer(void);
+extern int block_timer(void);
extern void enable_timer(int);
==== //depot/projects/trustedbsd/base/lib/libatm/timer.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libatm/timer.c,v 1.7 2002/06/30 23:36:21 naddy Exp $");
+__FBSDID("$FreeBSD: src/lib/libatm/timer.c,v 1.8 2003/03/25 04:29:26 mdodd Exp $");
/*
* User Space Library Functions
@@ -72,7 +72,7 @@
*
*/
static void
-timer_tick()
+timer_tick(void)
{
/*
* Bump the timer flag
@@ -96,10 +96,10 @@
*
*/
void
-timer_proc()
+timer_proc(void)
{
Harp_timer *htp;
- void (*f)();
+ void (*f)(Harp_timer *);
/*
* Reset marks in all timers on the queue
@@ -188,7 +188,7 @@
/*
* Set up signal handler
*/
- if (signal(SIGALRM, timer_tick) == SIG_ERR) {
+ if (signal(SIGALRM, (sig_t)timer_tick) == SIG_ERR) {
return(errno);
}
==== //depot/projects/trustedbsd/base/lib/libc/gen/_spinlock_stub.c#3 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/_spinlock_stub.c,v 1.7 2002/02/01 00:57:29 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/_spinlock_stub.c,v 1.8 2003/03/26 04:02:24 jeff Exp $");
#include <stdio.h>
@@ -43,6 +43,7 @@
*/
__weak_reference(_atomic_lock_stub, _atomic_lock);
__weak_reference(_spinlock_stub, _spinlock);
+__weak_reference(_spinlock_stub, _spinunlock);
__weak_reference(_spinlock_debug_stub, _spinlock_debug);
@@ -65,6 +66,14 @@
}
/*
+ * This function is a stub for the spinunlock function in libpthread.
+ */
+void
+_spinunlock_stub(spinlock_t *lck)
+{
+}
+
+/*
* This function is a stub for the debug spinlock function in libpthread.
*/
void
==== //depot/projects/trustedbsd/base/lib/libc/include/spinlock.h#3 (text+ko) ====
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc/include/spinlock.h,v 1.5 2002/03/21 22:47:52 obrien Exp $
+ * $FreeBSD: src/lib/libc/include/spinlock.h,v 1.6 2003/03/26 04:02:24 jeff Exp $
*
* Lock definitions used in both libc and libpthread.
*
@@ -52,7 +52,7 @@
#define _SPINLOCK_INITIALIZER { 0, 0, 0, 0 }
-#define _SPINUNLOCK(_lck) (_lck)->access_lock = 0
+#define _SPINUNLOCK(_lck) _spinunlock(_lck);
#ifdef _LOCK_DEBUG
#define _SPINLOCK(_lck) _spinlock_debug(_lck, __FILE__, __LINE__)
#else
@@ -65,6 +65,7 @@
__BEGIN_DECLS
long _atomic_lock(volatile long *);
void _spinlock(spinlock_t *);
+void _spinunlock(spinlock_t *);
void _spinlock_debug(spinlock_t *, char *, int);
__END_DECLS
==== //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_spinlock.c#4 (text+ko) ====
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc_r/uthread/uthread_spinlock.c,v 1.11 2002/05/24 04:32:28 deischen Exp $
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_spinlock.c,v 1.12 2003/03/26 04:02:24 jeff Exp $
*
*/
@@ -44,6 +44,12 @@
#include "pthread_private.h"
+void
+_spinunlock(spinlock_t *lck)
+{
+ lck->access_lock = 0;
+}
+
/*
* Lock a location for the running thread. Yield to allow other
* threads to run if this thread is blocked because the lock is
==== //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_spinlock.c#2 (text+ko) ====
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libpthread/thread/thr_spinlock.c,v 1.12 2002/09/16 08:45:36 mini Exp $
+ * $FreeBSD: src/lib/libpthread/thread/thr_spinlock.c,v 1.13 2003/03/26 04:02:24 jeff Exp $
*
*/
@@ -44,6 +44,13 @@
#include "thr_private.h"
+void
+_spinunlock(spinlock_t *lck)
+{
+ lck->access_lock = 0;
+}
+
+
/*
* Lock a location for the running thread. Yield to allow other
* threads to run if this thread is blocked because the lock is
==== //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.8#10 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.61 2003/02/24 22:53:21 ru Exp $
+.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.62 2003/03/25 22:20:02 silby Exp $
.\"
.Dd January 27, 2000
.Dt FTPD 8
@@ -184,12 +184,15 @@
.Ar timeout
seconds (the default is 15 minutes).
.It Fl U
-In previous versions of
-.Nm ,
-when a passive mode client requested a data connection to the server,
-the server would use data ports in the range 1024..4999. Now, by default,
-the server will use data ports in the range 49152..65535. Specifying this
-option will revert to the old behavior.
+This option instructs ftpd to use data ports in the range of
+IP_PORTRANGE_DEFAULT instead of in the range of IP_PORTRANGE_HIGH.
+Such a change may be useful for some specific firewall configurations;
+see
+.Xr ip 4
+for more information.
+.Pp
+Note that option is a virtual no-op in FreeBSD 5.0 and above; both port
+ranges are indentical by default.
.It Fl u
The default file creation mode mask is set to
.Ar umask ,
==== //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#61 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The FreeBSD Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.524 2003/03/22 04:37:16 hrs Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.527 2003/03/25 20:21:20 olgeni Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -183,7 +183,7 @@
default. This change greatly decreases the need for a static,
centralized table of major number assignments to device drivers
(a few drivers retain their old static major numbers for
- compatability), and also reduces the possibility of running out
+ compatibility), and also reduces the possibility of running out
of device major numbers.</para>
<sect3>
@@ -323,7 +323,7 @@
<para>A number of changes have been made to the &man.cd.4;
driver. The primary user-visible change is improved
- compatability with ATAPI/USB/Firewire CDROM drives.</para>
+ compatibility with ATAPI/USB/Firewire CDROM drives.</para>
<para>&man.geom.4; is now mandatory; the
<literal>NO_GEOM</literal> has been removed from the set of
@@ -513,7 +513,8 @@
the <quote>Don't Fragment</quote> bit on outgoing packets.</para>
<para>&man.ping.8; now supports a <option>-M</option> option to use
- ICMP mask request or timestamp request messages instead of ICMP echo requests.</para>
+ ICMP mask request or timestamp request messages instead of ICMP
+ echo requests.</para>
<para>&man.ping.8; now supports a <option>-z</option> flag to set
the Type of Service bits in outgoing packets.</para>
@@ -580,7 +581,7 @@
<para><application>FILE</application> has been updated to
3.41. &merged;</para>
- <para><application>GCC</application> has been updated to
+ <para><application>GCC</application> has been updated to
3.2.2 (release version).</para>
<para>The <application>ISC DHCP</application> client has been
@@ -590,7 +591,7 @@
form of <application>KTH eBones</application>) has been
removed. Users requiring this functionality can still get it
from the <filename role="port">security/krb4</filename> port
- (or package). Kerberos IV compatability mode for Kerberos 5
+ (or package). Kerberos IV compatibility mode for Kerberos 5
has been removed, and the
<literal>k5<replaceable>program</replaceable></literal>
userland utilities have been renamed to
==== //depot/projects/trustedbsd/base/sbin/atm/ilmid/ilmid.c#6 (text+ko) ====
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.14 2003/01/01 18:48:45 schweikh Exp $
+ * @(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.27 2003/03/26 05:49:42 mdodd Exp $
*
*/
@@ -65,15 +65,17 @@
#include <err.h>
#include <errno.h>
#include <libatm.h>
+#include <libgen.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <syslog.h>
#include <time.h>
#include <unistd.h>
+#include <ctype.h>
#ifndef lint
-__RCSID("@(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.14 2003/01/01 18:48:45 schweikh Exp $");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.27 2003/03/26 05:49:42 mdodd Exp $");
#endif
@@ -92,7 +94,15 @@
#define ASN_IPADDR 0x40
#define ASN_TIMESTAMP 0x43
-static char *Var_Types[] = { "", "", "ASN_INTEGER", "", "ASN_OCTET", "ASN_NULL", "ASN_OBJID" };
+static const char *Var_Types[] = {
+ "",
+ "",
+ "ASN_INTEGER",
+ "",
+ "ASN_OCTET",
+ "ASN_NULL",
+ "ASN_OBJID"
+};
/*
* Define SNMP PDU types
@@ -103,8 +113,15 @@
#define PDU_TYPE_SET 0xA3
#define PDU_TYPE_TRAP 0xA4
-static char *PDU_Types[] = { "GET REQUEST", "GETNEXT REQUEST", "GET RESPONSE", "SET REQUEST",
- "TRAP" };
+static char *PDU_Types[] = {
+ "GET REQUEST",
+ "GETNEXT REQUEST",
+ "GET RESPONSE",
+ "SET REQUEST",
+ "TRAP",
+ " ?? ",
+ " ??? "
+};
/*
* Define TRAP codes
@@ -235,7 +252,7 @@
{{ 9, 43, 6, 1, 4, 1, 353, 2, 7, 1 }},
#define MY_OBJID 11
{{ 7, 43, 6, 1, 4, 1, 9999, 1 }},
-#define SETPFX_OBJID 12
+#define SETPFX_OBJID 12 /* ATM Forum says 1=valid, 2=invalid, not 0! */
{{ 12, 43, 6, 1, 4, 1, 353, 2, 7, 1, 1, 3, 0 }},
#define ENTERPRISE_OBJID 13
{{ 8, 43, 6, 1, 4, 1, 3, 1, 1 }},
@@ -243,6 +260,8 @@
{{ 10, 43, 6, 1, 4, 1, 353, 2, 1, 4, 0 }},
#define ATMF_SYSID 15
{{ 12, 43, 6, 1, 4, 1, 353, 2, 1, 1, 1, 8, 0 }},
+#define MADGE_OBJECT1 16 /* I don't have a clue ... -RH */
+ {{ 9, 43, 6, 1, 4, 1, 353, 2, 7, 99 }},
>>> TRUNCATED FOR MAIL (1000 lines) <<<
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list