PERFORCE change 104265 for review
Robert Watson
rwatson at FreeBSD.org
Wed Aug 16 17:44:56 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=104265
Change 104265 by rwatson at rwatson_zoo on 2006/08/16 17:41:15
Integrate TrustedBSD audit3 branch from TrustedBSD base. Change
list in @104257.
Affected files ...
.. //depot/projects/trustedbsd/audit3/Makefile.inc1#12 integrate
.. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#7 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/BSD/Makefile#4 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/HISTORY#5 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/Makefile#5 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/bpf_filter.c#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ip_fil.c#2 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipf.h#5 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/iplang/iplang_y.y#4 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipmon.h#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipsd/sbpf.c#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipsend/ipsend.c#5 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipsend/iptests.c#4 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipsend/lsock.c#4 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipsend/resend.c#4 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipsend/sbpf.c#4 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipsend/sock.c#4 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipt.h#4 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/Makefile#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/addicmp.c#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/addkeep.c#3 delete
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/facpri.c#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/getport.c#2 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/icmpcode.c#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/ipft_tx.c#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/make_range.c#3 delete
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/optprint.c#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/printfr.c#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/printlog.c#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/man/ipmon.8#5 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/radix.c#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/samples/proxy.c#4 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/Makefile#5 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/f20#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/i1#4 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/i10#2 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/i11#5 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/i18#2 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/i5#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/i8#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/i9#4 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/in2#4 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/in5#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/ni19#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/ni20#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/ni21#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/input/f2#2 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/input/f20#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/input/ni19#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/input/ni20#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/input/ni21#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/f20#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i1#4 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i10#2 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i11#5 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i15#2 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i17#2 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i18#2 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i5#2 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i8#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i9#4 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/in2#4 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/in5#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/ni19.ipf#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/ni19.nat#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/ni20.ipf#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/ni20.nat#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/ni21.ipf#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/ni21.nat#1 branch
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/test.format#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipf.c#4 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipf_y.y#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipfcomp.c#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipfs.c#2 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipfstat.c#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipftest.c#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipmon.c#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipnat_y.y#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipsyncm.c#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipsyncs.c#3 integrate
.. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/lexer.c#2 integrate
.. //depot/projects/trustedbsd/audit3/contrib/smbfs/smbutil/print.c#2 integrate
.. //depot/projects/trustedbsd/audit3/contrib/smbfs/smbutil/view.c#3 integrate
.. //depot/projects/trustedbsd/audit3/etc/defaults/rc.conf#15 integrate
.. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/libbfd/Makefile.arm#2 integrate
.. //depot/projects/trustedbsd/audit3/gnu/usr.bin/groff/contrib/mm/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit3/gnu/usr.bin/groff/tmac/Makefile#3 integrate
.. //depot/projects/trustedbsd/audit3/gnu/usr.bin/groff/tmac/mdoc.local#6 integrate
.. //depot/projects/trustedbsd/audit3/lib/libc/gen/msgctl.3#2 integrate
.. //depot/projects/trustedbsd/audit3/lib/libc/gen/syslog.c#6 integrate
.. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/malloc.c#11 integrate
.. //depot/projects/trustedbsd/audit3/lib/libc/string/strcoll.3#2 integrate
.. //depot/projects/trustedbsd/audit3/lib/libc/sys/connect.2#3 integrate
.. //depot/projects/trustedbsd/audit3/lib/libc/sys/getfsstat.2#3 integrate
.. //depot/projects/trustedbsd/audit3/lib/libdisk/write_ia64_disk.c#2 integrate
.. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_lastlog/pam_lastlog.c#2 integrate
.. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_init.c#9 integrate
.. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_mutex.c#10 integrate
.. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_private.h#11 integrate
.. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_pspinlock.c#3 integrate
.. //depot/projects/trustedbsd/audit3/libexec/tftpd/tftpd.8#3 integrate
.. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#14 integrate
.. //depot/projects/trustedbsd/audit3/sbin/dump/main.c#3 integrate
.. //depot/projects/trustedbsd/audit3/sbin/dump/optr.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sbin/geom/class/eli/geli.8#6 integrate
.. //depot/projects/trustedbsd/audit3/sbin/geom/class/eli/geom_eli.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifclone.c#3 integrate
.. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifieee80211.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sbin/ipf/libipf/Makefile#3 integrate
.. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw2.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sbin/ping/ping.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sbin/sysctl/sysctl.c#7 integrate
.. //depot/projects/trustedbsd/audit3/share/examples/drivers/make_device_driver.sh#2 integrate
.. //depot/projects/trustedbsd/audit3/share/examples/drivers/make_pseudo_driver.sh#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man4/acpi.4#9 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man4/ata.4#9 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man4/if_bridge.4#7 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man4/ng_pppoe.4#7 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man4/uscanner.4#6 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man4/vlan.4#8 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man7/release.7#6 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man9/sysctl.9#2 integrate
.. //depot/projects/trustedbsd/audit3/share/mk/bsd.cpu.mk#6 integrate
.. //depot/projects/trustedbsd/audit3/share/mk/bsd.sys.mk#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/Makefile#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/acpica/madt.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/pmap.c#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/support.S#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/trap.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/include/pmap.h#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux.h#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_dummy.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_machdep.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_proto.h#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_syscall.h#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_sysent.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_sysvec.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/syscalls.conf#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/syscalls.master#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/arm/elf_trampoline.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/arm/mem.c#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/arm/pmap.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/arm/vm_machdep.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91_st.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/at91/kb920x_machdep.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/include/pmap.h#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/include/sf_buf.h#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/include/vmparam.h#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/sa11x0/assabet_machdep.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/arm/xscale/i80321/iq31244_machdep.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/Makefile#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/Makefile#1 branch
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootiic/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootiic/arm_init.S#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootiic/env_vars.c#1 branch
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootiic/env_vars.h#1 branch
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootiic/main.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/at91rm9200.h#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/eeprom.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/eeprom.h#2 delete
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/emac.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/emac.h#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/env_vars.c#2 delete
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/env_vars.h#2 delete
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/lib.h#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/loader_prompt.c#2 delete
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/loader_prompt.h#2 delete
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/p_string.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/p_string.h#2 delete
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/spi_flash.c#1 branch
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/spi_flash.h#1 branch
.. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/xmodem.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/boot/forth/loader.conf#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_pass.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_misc.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_proto.h#19 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscall.h#19 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscalls.c#19 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#20 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.conf#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/linprocfs/linprocfs.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_emul.c#1 branch
.. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_emul.h#1 branch
.. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_futex.c#1 branch
.. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_futex.h#1 branch
.. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_misc.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_signal.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_time.c#1 branch
.. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_util.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_proto.h#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_stream.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_syscall.h#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_syscallnames.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_sysent.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/compat/svr4/syscalls.conf#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/conf/files#25 integrate
.. //depot/projects/trustedbsd/audit3/sys/conf/files.amd64#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/conf/files.i386#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/conf/kern.post.mk#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/conf/kmod.mk#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/conf/options.arm#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acfreebsd.h#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/fil.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_auth.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_auth.h#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_compat.h#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_fil.h#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_frag.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_log.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_nat.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_proxy.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_scan.c#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_state.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_sync.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_sync.h#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ipl.h#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/mlfk_ipl.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/acpi_support/acpi_ibm.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/acpica/Osd/OsdMemory.c#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_dock.c#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_hpet.c#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_pci_link.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_video.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-chipset.c#14 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-disk.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-pci.h#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_ath.c#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_athioctl.h#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/bce/if_bce.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bge.c#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bgereg.h#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.c#14 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.h#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em_hw.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em_hw.h#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/exca/excareg.h#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/hme/if_hme.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_pci.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/isp/ispvar.h#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/mii/rgephy.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/nfe/if_nfe.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/pccard/pccard_cis.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbb.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbb_pci.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbbreg.h#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/sk/if_sk.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/emu10k1.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/emu10kx.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/emu10kx.h#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/ich.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/stge/if_stge.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/ti/if_ti.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdevs#14 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/usb/uscanner.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/fs/nwfs/nwfs_io.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/fs/smbfs/smbfs_io.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli.h#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli_ctl.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/geom_gpt.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/label/g_label.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/label/g_label_msdosfs.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/label/g_label_msdosfs.h#1 branch
.. //depot/projects/trustedbsd/audit3/sys/geom/mirror/g_mirror.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/geom/raid3/g_raid3.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/acpica/acpi_machdep.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/acpica/acpi_wakeup.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/acpica/madt.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/conf/XBOX#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/i386/machdep.c#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/i386/pmap.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/i386/support.s#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/i386/trap.c#14 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_isc_syscall.h#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_isc_sysent.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_proto.h#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_syscall.h#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_sysent.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix.h#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix_syscall.h#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix_sysent.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/syscalls.conf#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/syscalls.isc.conf#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/syscalls.xenix.conf#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/include/pmap.h#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/isa/clock.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux.h#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_dummy.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_machdep.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_proto.h#14 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_syscall.h#14 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysent.c#18 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysvec.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.conf#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.master#18 integrate
.. //depot/projects/trustedbsd/audit3/sys/i386/xbox/xbox.c#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/ia64/include/pmap.h#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/Makefile#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#33 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_exec.c#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_fork.c#18 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_lock.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_mutex.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_subr.c#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_sx.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_time.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/makesyscalls.sh#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/subr_turnstile.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#24 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#38 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/systrace_args.c#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/uipc_proto.c#4 delete
.. //depot/projects/trustedbsd/audit3/sys/kern/uipc_sem.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/uipc_socket.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/uipc_syscalls.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/uipc_usrreq.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/vfs_aio.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/vfs_bio.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/vfs_lookup.c#12 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/vfs_subr.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/libkern/strstr.c#1 branch
.. //depot/projects/trustedbsd/audit3/sys/modules/if_ef/Makefile#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/modules/if_ppp/Makefile#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/modules/linprocfs/Makefile#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/modules/linsysfs/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/modules/linux/Makefile#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/modules/netgraph/mppc/Makefile#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/modules/sound/sound/Makefile#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/net/bpf.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/net/bridgestp.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/net/if_tun.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/net/if_vlan.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_input.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_ioctl.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_ioctl.h#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_output.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/netatalk/ddp_usrreq.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_pppoe.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_pppoe.h#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_input.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_subr.c#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_timer.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_timer.h#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfs_bio.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfs_vfsops.c#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/pc98/include/md_var.h#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/pc98/pc98/pc98_machdep.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/pci/agp.c#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/pci/if_xl.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/mac_biba/mac_biba.c#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/pmap.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/dirent.h#2 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/domain.h#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/eventhandler.h#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/imgact.h#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/libkern.h#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/lockmgr.h#4 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/mac_policy.h#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/param.h#9 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/sx.h#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#23 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#24 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/sysctl.h#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/sysent.h#6 integrate
.. //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#27 integrate
.. //depot/projects/trustedbsd/audit3/sys/vm/device_pager.c#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/vm/swap_pager.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/vm/vm_fault.c#11 integrate
.. //depot/projects/trustedbsd/audit3/sys/vm/vm_object.c#10 integrate
.. //depot/projects/trustedbsd/audit3/sys/vm/vm_page.c#13 integrate
.. //depot/projects/trustedbsd/audit3/sys/vm/vm_page.h#7 integrate
.. //depot/projects/trustedbsd/audit3/sys/vm/vnode_pager.c#9 integrate
.. //depot/projects/trustedbsd/audit3/tools/tools/ath/athstats/Makefile#3 integrate
.. //depot/projects/trustedbsd/audit3/tools/tools/ath/athstats/athstats.c#4 integrate
.. //depot/projects/trustedbsd/audit3/tools/tools/ath/athstats/athstats.h#1 branch
.. //depot/projects/trustedbsd/audit3/tools/tools/ath/athstats/main.c#1 branch
.. //depot/projects/trustedbsd/audit3/tools/tools/ath/athstats/statfoo.c#1 branch
.. //depot/projects/trustedbsd/audit3/tools/tools/ath/athstats/statfoo.h#1 branch
.. //depot/projects/trustedbsd/audit3/tools/tools/nanobsd/nanobsd.sh#6 integrate
.. //depot/projects/trustedbsd/audit3/tools/tools/net80211/Makefile#3 integrate
.. //depot/projects/trustedbsd/audit3/tools/tools/net80211/README#2 integrate
.. //depot/projects/trustedbsd/audit3/tools/tools/net80211/w00t/libw00t/w00t.c#2 integrate
.. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/Makefile#1 branch
.. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/README#1 branch
.. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/dics/Makefile#1 branch
.. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/dics/dics.c#1 branch
.. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/udps/Makefile#1 branch
.. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/udps/udps.c#1 branch
.. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/wesside/Makefile#1 branch
.. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/wesside/wesside.c#1 branch
.. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlaninject/wlaninject.c#2 integrate
.. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlanstats/Makefile#3 integrate
.. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlanstats/main.c#1 branch
.. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlanstats/statfoo.c#1 branch
.. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlanstats/statfoo.h#1 branch
.. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlanstats/wlanstats.c#2 integrate
.. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlanstats/wlanstats.h#1 branch
.. //depot/projects/trustedbsd/audit3/usr.bin/calendar/calendars/calendar.history#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.bin/hexdump/parse.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.bin/split/split.1#6 integrate
.. //depot/projects/trustedbsd/audit3/usr.bin/split/split.c#4 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#18 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/kldxref/kldxref.c#5 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/mailwrapper/mailwrapper.8#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/mailwrapper/mailwrapper.c#3 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/named/Makefile#4 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/ngctl/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/ngctl/main.c#5 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/lib/url.c#5 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/version/perform.c#7 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rpc.lockd/lockd_lock.c#4 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rpc.statd/procs.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/rtsold/rtsold.8#4 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/command.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/config.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/devices.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/disks.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/dispatch.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/dmenu.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/globals.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/install.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/keymap.c#2 delete
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/label.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/list.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/main.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/menus.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/misc.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/msg.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/rtermcap.c#2 delete
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/sade.8#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/sade.h#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/system.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/termcap.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/usb.c#2 delete
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/variable.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/sade/wizard.c#2 integrate
.. //depot/projects/trustedbsd/audit3/usr.sbin/yppush/yppush_main.c#4 integrate
Differences ...
==== //depot/projects/trustedbsd/audit3/Makefile.inc1#12 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.550 2006/08/02 15:26:15 netchild Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.552 2006/08/09 11:03:06 netchild Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
==== //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#7 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.42 2006/08/04 21:29:22 brooks Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.47 2006/08/14 18:20:36 netchild Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -745,6 +745,7 @@
OLD_FILES+=usr/bin/perlcc
OLD_FILES+=usr/bin/perldoc
OLD_FILES+=usr/bin/suidperl
+OLD_FILES+=usr/lib/pam_ftp.so
OLD_FILES+=usr/libdata/perl/5.00503/CGI/Apache.pm
OLD_FILES+=usr/libdata/perl/5.00503/CGI/Carp.pm
OLD_FILES+=usr/libdata/perl/5.00503/CGI/Cookie.pm
@@ -2726,7 +2727,209 @@
OLD_FILES+=usr/games/worm
OLD_FILES+=usr/games/worms
OLD_FILES+=usr/games/wump
+OLD_FILES+=sbin/mount_reiserfs
+OLD_FILES+=usr/bin/hesinfo
+OLD_FILES+=usr/share/examples/etc/usbd.conf
+OLD_FILES+=usr/share/examples/meteor/README
+OLD_FILES+=usr/share/examples/meteor/rgb16.c
+OLD_FILES+=usr/share/examples/meteor/rgb24.c
+OLD_FILES+=usr/share/examples/meteor/test-n.c
+OLD_FILES+=usr/share/examples/meteor/yuvpk.c
+OLD_FILES+=usr/share/examples/meteor/yuvpl.c
+OLD_FILES+=usr/share/examples/worm/README
+OLD_FILES+=usr/share/examples/worm/makecdfs.sh
+OLD_FILES+=usr/share/groff_font/devlj4/Makefile
+OLD_FILES+=usr/share/groff_font/devlj4/text.map
+OLD_FILES+=usr/share/groff_font/devlj4/special.map
+OLD_FILES+=usr/share/misc/nslookup.help
+OLD_FILES+=usr/share/sendmail/cf/feature/nodns.m4
+OLD_FILES+=usr/share/syscons/keymaps/lat-amer.kbd
+OLD_FILES+=usr/share/vi/catalog/ru_SU.KOI8-R
+OLD_FILES+=usr/share/zoneinfo/Africa/Timbuktu
+OLD_FILES+=usr/share/zoneinfo/America/Buenos_Aires
+OLD_FILES+=usr/share/zoneinfo/America/Cordoba
+OLD_FILES+=usr/share/zoneinfo/America/Jujuy
+OLD_FILES+=usr/share/zoneinfo/America/Catamarca
+OLD_FILES+=usr/share/zoneinfo/America/Mendoza
+OLD_FILES+=usr/share/zoneinfo/America/Indianapolis
+OLD_FILES+=usr/share/zoneinfo/America/Louisville
+OLD_FILES+=usr/share/zoneinfo/America/Argentina/ComodRivadavia
+OLD_FILES+=usr/share/zoneinfo/Europe/Belfast
+OLD_FILES+=usr/share/zoneinfo/Pacific/Yap
+OLD_FILES+=usr/share/zoneinfo/SystemV/YST9
+OLD_FILES+=usr/share/zoneinfo/SystemV/PST8
+OLD_FILES+=usr/share/zoneinfo/SystemV/EST5EDT
+OLD_FILES+=usr/share/zoneinfo/SystemV/CST6CDT
+OLD_FILES+=usr/share/zoneinfo/SystemV/MST7MDT
+OLD_FILES+=usr/share/zoneinfo/SystemV/PST8PDT
+OLD_FILES+=usr/share/zoneinfo/SystemV/YST9YDT
+OLD_FILES+=usr/share/zoneinfo/SystemV/HST10
+OLD_FILES+=usr/share/zoneinfo/SystemV/MST7
+OLD_FILES+=usr/share/zoneinfo/SystemV/EST5
+OLD_FILES+=usr/share/zoneinfo/SystemV/AST4ADT
+OLD_FILES+=usr/share/zoneinfo/SystemV/CST6
+OLD_FILES+=usr/share/zoneinfo/SystemV/AST4
+OLD_FILES+=usr/share/doc/ntp/accopt.htm
+OLD_FILES+=usr/share/doc/ntp/assoc.htm
+OLD_FILES+=usr/share/doc/ntp/audio.htm
+OLD_FILES+=usr/share/doc/ntp/authopt.htm
+OLD_FILES+=usr/share/doc/ntp/biblio.htm
+OLD_FILES+=usr/share/doc/ntp/build.htm
+OLD_FILES+=usr/share/doc/ntp/clockopt.htm
+OLD_FILES+=usr/share/doc/ntp/config.htm
+OLD_FILES+=usr/share/doc/ntp/confopt.htm
+OLD_FILES+=usr/share/doc/ntp/copyright.htm
+OLD_FILES+=usr/share/doc/ntp/debug.htm
+OLD_FILES+=usr/share/doc/ntp/driver1.htm
+OLD_FILES+=usr/share/doc/ntp/driver10.htm
+OLD_FILES+=usr/share/doc/ntp/driver11.htm
+OLD_FILES+=usr/share/doc/ntp/driver12.htm
+OLD_FILES+=usr/share/doc/ntp/driver16.htm
+OLD_FILES+=usr/share/doc/ntp/driver18.htm
+OLD_FILES+=usr/share/doc/ntp/driver19.htm
+OLD_FILES+=usr/share/doc/ntp/driver2.htm
+OLD_FILES+=usr/share/doc/ntp/driver20.htm
+OLD_FILES+=usr/share/doc/ntp/driver22.htm
+OLD_FILES+=usr/share/doc/ntp/driver23.htm
+OLD_FILES+=usr/share/doc/ntp/driver24.htm
+OLD_FILES+=usr/share/doc/ntp/driver26.htm
+OLD_FILES+=usr/share/doc/ntp/driver27.htm
+OLD_FILES+=usr/share/doc/ntp/driver28.htm
+OLD_FILES+=usr/share/doc/ntp/driver29.htm
+OLD_FILES+=usr/share/doc/ntp/driver3.htm
+OLD_FILES+=usr/share/doc/ntp/driver30.htm
+OLD_FILES+=usr/share/doc/ntp/driver32.htm
+OLD_FILES+=usr/share/doc/ntp/driver33.htm
+OLD_FILES+=usr/share/doc/ntp/driver34.htm
+OLD_FILES+=usr/share/doc/ntp/driver35.htm
+OLD_FILES+=usr/share/doc/ntp/driver36.htm
+OLD_FILES+=usr/share/doc/ntp/driver37.htm
+OLD_FILES+=usr/share/doc/ntp/driver4.htm
+OLD_FILES+=usr/share/doc/ntp/driver5.htm
+OLD_FILES+=usr/share/doc/ntp/driver6.htm
+OLD_FILES+=usr/share/doc/ntp/driver7.htm
+OLD_FILES+=usr/share/doc/ntp/driver8.htm
+OLD_FILES+=usr/share/doc/ntp/driver9.htm
+OLD_FILES+=usr/share/doc/ntp/exec.htm
+OLD_FILES+=usr/share/doc/ntp/extern.htm
+OLD_FILES+=usr/share/doc/ntp/gadget.htm
+OLD_FILES+=usr/share/doc/ntp/hints.htm
+OLD_FILES+=usr/share/doc/ntp/howto.htm
+OLD_FILES+=usr/share/doc/ntp/htmlprimer.htm
+OLD_FILES+=usr/share/doc/ntp/index.htm
+OLD_FILES+=usr/share/doc/ntp/kern.htm
+OLD_FILES+=usr/share/doc/ntp/kernpps.htm
+OLD_FILES+=usr/share/doc/ntp/ldisc.htm
+OLD_FILES+=usr/share/doc/ntp/measure.htm
+OLD_FILES+=usr/share/doc/ntp/miscopt.htm
+OLD_FILES+=usr/share/doc/ntp/monopt.htm
+OLD_FILES+=usr/share/doc/ntp/mx4200data.htm
+OLD_FILES+=usr/share/doc/ntp/notes.htm
+OLD_FILES+=usr/share/doc/ntp/ntpd.htm
+OLD_FILES+=usr/share/doc/ntp/ntpdate.htm
+OLD_FILES+=usr/share/doc/ntp/ntpdc.htm
+OLD_FILES+=usr/share/doc/ntp/ntpq.htm
+OLD_FILES+=usr/share/doc/ntp/ntptime.htm
+OLD_FILES+=usr/share/doc/ntp/ntptrace.htm
+OLD_FILES+=usr/share/doc/ntp/parsedata.htm
+OLD_FILES+=usr/share/doc/ntp/parsenew.htm
+OLD_FILES+=usr/share/doc/ntp/patches.htm
+OLD_FILES+=usr/share/doc/ntp/porting.htm
+OLD_FILES+=usr/share/doc/ntp/pps.htm
+OLD_FILES+=usr/share/doc/ntp/prefer.htm
+OLD_FILES+=usr/share/doc/ntp/qth.htm
+OLD_FILES+=usr/share/doc/ntp/quick.htm
+OLD_FILES+=usr/share/doc/ntp/rdebug.htm
+OLD_FILES+=usr/share/doc/ntp/refclock.htm
+OLD_FILES+=usr/share/doc/ntp/release.htm
+OLD_FILES+=usr/share/doc/ntp/tickadj.htm
+OLD_FILES+=usr/share/doc/papers/nqnfs.ascii.gz
+OLD_FILES+=usr/share/doc/papers/px.ascii.gz
+OLD_FILES+=usr/share/man/man1/hesinfo.1.gz
+OLD_FILES+=usr/share/man/man3/mbrune.3.gz
+OLD_FILES+=usr/share/man/man3/rune.3.gz
+OLD_FILES+=usr/share/man/man3/hesiod.3.gz
+OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz
+OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz
+OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz
+OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz
+OLD_FILES+=usr/share/man/man3/exp10f.3.gz
+OLD_FILES+=usr/share/man/man3/exp10.3.gz
+OLD_FILES+=usr/share/man/man3/mbrrune.3.gz
+OLD_FILES+=usr/share/man/man3/mbmb.3.gz
+OLD_FILES+=usr/share/man/man3/sputrune.3.gz
+OLD_FILES+=usr/share/man/man3/sgetrune.3.gz
+OLD_FILES+=usr/share/man/man3/setrunelocale.3.gz
+OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz
+OLD_FILES+=usr/share/man/man3/mbrune.3.gz
+OLD_FILES+=usr/share/man/man3/rune.3.gz
+OLD_FILES+=usr/share/man/man3/hesiod.3.gz
+OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz
+OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz
+OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz
+OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz
+OLD_FILES+=usr/share/man/man3/exp10f.3.gz
+OLD_FILES+=usr/share/man/man3/exp10.3.gz
+OLD_FILES+=usr/share/man/man3/mbrrune.3.gz
+OLD_FILES+=usr/share/man/man3/mbmb.3.gz
+OLD_FILES+=usr/share/man/man3/sputrune.3.gz
+OLD_FILES+=usr/share/man/man3/sgetrune.3.gz
+OLD_FILES+=usr/share/man/man3/setrunelocale.3.gz
+OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz
+OLD_FILES+=usr/share/man/man3/fungetrune.3.gz
+OLD_FILES+=usr/share/man/man3/fputrune.3.gz
+OLD_FILES+=usr/share/man/man3/fgetrune.3.gz
+OLD_FILES+=usr/share/man/man5/hesiod.conf.5.gz
+OLD_FILES+=usr/share/man/man5/usbd.conf.5.gz
+.if ${TARGET_ARCH} != "i386"
+OLD_FILES+=usr/share/man/man8/boot_i386.8.gz
+.endif
+OLD_FILES+=usr/share/man/man8/ofwdump.8.gz
+OLD_FILES+=usr/share/man/man8/mount_reiserfs.8.gz
+OLD_FILES+=usr/share/man/man9/VFS_START.9.gz
+OLD_FILES+=usr/share/man/man9/cpu_critical_exit.9.gz
+OLD_FILES+=usr/share/man/man9/cpu_critical_enter.9.gz
+OLD_FILES+=usr/share/info/annotate.info.gz
+OLD_FILES+=usr/share/info/tar.info.gz
+OLD_FILES+=usr/share/bsnmp/defs/tree.def
+OLD_FILES+=usr/share/bsnmp/defs/mibII_tree.def
+OLD_FILES+=usr/share/bsnmp/defs/netgraph_tree.def
+OLD_FILES+=usr/share/bsnmp/mibs/FOKUS-MIB.txt
+OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-MIB.txt
+OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-SNMPD.txt
+OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-NETGRAPH.txt
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.x
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xbn
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xn
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xr
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xs
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xu
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xc
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xsc
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.x
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xbn
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xn
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xr
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xs
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xu
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xc
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xsc
+OLD_FILES+=usr/libdata/msdosfs/iso22dos
+OLD_FILES+=usr/libdata/msdosfs/iso72dos
+OLD_FILES+=usr/libdata/msdosfs/koi2dos
+OLD_FILES+=usr/libdata/msdosfs/koi8u2dos
+# The following files are *not* obsolete, they just don't get touched at
+# install, so don't add them:
+# - boot/loader.rc
+# - usr/share/tmac/man.local
+# - usr/share/tmac/mm/locale
+# - usr/share/tmac/mm/se_locale
+# - var/yp/Makefile
+
+# 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade
+OLD_LIBS+=lib/libcrypto.so.4
+OLD_LIBS+=usr/lib/libssl.so.4
# 20060521: gethostbyaddr(3) ABI change
OLD_LIBS+=usr/lib/libroken.so.8
OLD_LIBS+=lib/libatm.so.3
@@ -2950,7 +3153,14 @@
# 199909XX
OLD_LIBS+=usr/lib/libc_r.so.3
# ???
+OLD_LIBS+=usr/lib/libarchive.so.2
+OLD_LIBS+=usr/lib/libbsnmp.so.1
+OLD_LIBS+=usr/lib/libc_r.so.6
+OLD_LIBS+=usr/lib/libcipher.so.2
OLD_LIBS+=usr/lib/libgssapi.so.6
+OLD_LIBS+=usr/lib/libkse.so.1
+OLD_LIBS+=usr/lib/liblwres.so.3
+OLD_LIBS+=usr/lib/pam_ftp.so.2
# 20040925: bind9 import
OLD_DIRS+=usr/share/doc/bind/html
==== //depot/projects/trustedbsd/audit3/contrib/ipfilter/BSD/Makefile#4 (text+ko) ====
@@ -3,12 +3,13 @@
#
# See the IPFILTER.LICENCE file for details on licencing.
#
+TOP=../..
BINDEST=/usr/sbin
SBINDEST=/sbin
MANDIR=/usr/share/man
SEARCHDIRS!=echo $(BINDEST) $(SBINDEST) /bin /usr/bin /sbin /usr/sbin /usr/local/bin /usr/local/sbin | awk '{for(i=1;i<NF;i++){print $$i;}}' - | sort -u
-CC=gcc -Wall -Wuninitialized -Wstrict-prototypes -O
+CC=gcc -Wall -Wuninitialized -Wstrict-prototypes -O -Wmissing-prototypes -Wpointer-arith -Wno-sign-compare -Wno-traditional -Werror
#UFLAGS=-fprofile-arcs -ftest-coverage
CFLAGS=-g -I$(TOP)
#
@@ -17,7 +18,7 @@
DEVFS!=/usr/bin/lsvfs 2>&1 | sed -n 's/.*devfs.*/-DDEVFS/p'
CPU!=uname -m
INC=-I/usr/include -I/sys -I/sys/sys -I/sys/arch
-DEF=-D$(CPU) -D__$(CPU)__ -DINET -DKERNEL -D_KERNEL $(INC) $(DEVFS)
+DEF=-D$(CPU) -D__$(CPU)__ -DINET -DKERNEL -D_KERNEL $(INC) $(DEVFS) -fno-builtin
IPDEF=$(DEF) -DGATEWAY -DDIRECTED_BROADCAST
VNODESHDIR=/sys/kern
MLD=$(ML)
@@ -516,8 +517,8 @@
(cd $(TOP)/man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install; cd $(TOP))
coverage:
- ksh -c 'for i in *.da; do j=$${i%%.da}.c; gcov $$j 2>&1 | egrep -v "y.tab.c|Could|Creating|_l\.c|\.h"; done' | sort -n > report
- sort -n report | perl -e 'while(<>) { next if (/^0.00/); s/\%//g; @F=split;$$lc+=$$F[2];$$t += $$F[0]/100*$$F[2];} printf "%d of %d = %d%%\n", $$t, $$lc,$$t/$$lc*100;' >> report
+ ksh -c 'for i in *.da; do j=$${i%%.da}.c; gcov $$j 2>&1 | egrep -v "y.tab.c|Could|Creating|_l\.c|\.h"; done' | sort -k 1n -k 3n > report
+ sort -k 1n -k 3n report | perl -e 'while(<>) { next if (/^0.00/); s/\%//g; @F=split;$$lc+=$$F[2];$$t += ($$F[0]/100)*$$F[2];} printf "%d of %d = %d%%\n", $$t, $$lc,($$t/$$lc)*100;' >> report
clean-coverage:
/bin/rm -f *.gcov *.da
==== //depot/projects/trustedbsd/audit3/contrib/ipfilter/HISTORY#5 (text+ko) ====
@@ -10,6 +10,88 @@
# and especially those who have found the time to port IP Filter to new
# platforms.
#
+4.1.13 - Released 4 April 2006
+
+fix bug where null pointers introduced by proxies could cause a crash
+
+pass out the rule flags with SIOCAUTHW
+
+force loading NAT rules with bad proxy labels to cause an error
+
+nat_state is used unsafely in calls to fr_addstate
+
+make return-rst and return-icmp* work with auth rules
+
+4.1.12 - Released 28 March 2006
+
+poll support on FreeBSD/NetBSD needs to use selrecord/selwakeup
+
+make the fastroute code used by ipftest invoke state/NAT
+
+move verbose/debug macros out of fil.c and into ip_fil.h (for wider use)
+
+remove unused code in fr_fastroute
+
+fix NAT with rules that specify forward and reverise interfaces
+
+add missing ipfsync_canread() and ipfsync_canwrite()
+
+behaviour of \ on the end of a line in ipf.conf does not match older behaviour
+
+remove duplicate statistics line output with "ipfstat -s"
+4.1.11 - Released 19 March 2006
+
+Patch for NAT with ipfsync from N. Ersen (SESCI) - www.enderunix.org
+
+NetBSD coverity report fixes (from run 5)
+
+Possible to reacquire ipf_auth without releasing it in some circumstances
+
+Locking in FreeBSD's iplioctl for ipf_global isn't present like it shoudl be
+
+Add poll support for platforms I can build on: NetBSD, FreeBSD, Solaris, Linux
+
+Using auth rules to return "keep state" got broken with pushing fr_addstate
+call into fr_firewall
+
+all use of '!' in map/rdr rules to match use in ipf configs
+
+add -L command line option to ipmon to set the default syslog facility
+
+looking up a port number is more complex than needed in ipft_tx.c
+
+allow lib/getport to work when neither tcp or udp are specified in a rule
+
+remove some dead code from lib/addicmpc, lib/facpri.c, lib/icmpcode.c
+
+program in some more cases where TCP packets fail an initial in-window
+check but should be allowed to match
+
+filter rule added with NAT/state handling of SIOCSTPUT doesn't properly
+initialise all fields, making it possible to panic
+
+simplify NAT ICMP error handling where it updates checksums
+
+rename "min" variables to "xmin" on NetBSD to avoid problems with the
+macro "min"
+
+#ifdef's for NetBSD compile incorrect for pfil interface
+
+support select/poll on NetBSD
+
+copying out a packet with an auth rule fails (EFAULT) because the wrong
+pointer is passed to copyoutptr
+
+ip_len/ip_off where byte swapped twice instead of once for packets
+going to be stored on the auth queue
+
+change timeout queue manipulation functions to make fewer mutex calls
+
+fix use of skip rules with groups
+fix coding problems discovered by the coverity project for FreeBSD
+
+update BPF program validation with FreeBSD changes
+
4.1.10 - Released 6 December 2005
Expand regression testing to cover more features
==== //depot/projects/trustedbsd/audit3/contrib/ipfilter/Makefile#5 (text+ko) ====
@@ -5,8 +5,8 @@
# provided that this notice is preserved and due credit is given
# to the original author and the contributors.
#
-# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.5 2005/12/30 11:52:22 guido Exp $
-# Id: Makefile,v 2.76.2.13 2004/11/08 18:42:40 darrenr Exp
+# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.6 2006/08/16 12:23:00 guido Exp $
+# Id: Makefile,v 2.76.2.19 2006/03/17 10:38:38 darrenr Exp $
#
SHELL=/bin/sh
BINDEST=/usr/local/bin
@@ -135,6 +135,7 @@
@echo "freebsd3 - compile for FreeBSD-3.x"
@echo "freebsd4 - compile for FreeBSD-4.x"
@echo "freebsd5 - compile for FreeBSD-5.x"
+ @echo "freebsd6 - compile for FreeBSD-6.x"
@echo "bsd - compile for generic 4.4BSD systems"
@echo "bsdi - compile for BSD/OS"
@echo "irix - compile for SGI IRIX"
@@ -187,7 +188,7 @@
fi
make freebsd20
-freebsd5: include
+freebsd5 freebsd6: include
if [ x$(INET6) = x ] ; then \
echo "#undef INET6" > opt_inet6.h; \
else \
==== //depot/projects/trustedbsd/audit3/contrib/ipfilter/bpf_filter.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/ipfilter/bpf_filter.c,v 1.4 2005/12/30 11:52:22 guido Exp $ */
+/* $FreeBSD: src/contrib/ipfilter/bpf_filter.c,v 1.5 2006/08/16 12:23:00 guido Exp $ */
/*-
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -42,7 +42,7 @@
#if !(defined(lint) || defined(KERNEL) || defined(_KERNEL))
static const char rcsid[] =
- "@(#) $Header: /devel/CVS/IP-Filter/bpf_filter.c,v 2.2.2.1 2005/06/18 02:41:30 darrenr Exp $ (LBL)";
+ "@(#) $Header: /devel/CVS/IP-Filter/bpf_filter.c,v 2.2.2.2 2005/12/30 12:57:28 darrenr Exp $ (LBL)";
#endif
#include <sys/param.h>
@@ -468,9 +468,10 @@
/*
* Return true if the 'fcode' is a valid filter program.
* The constraints are that each jump be forward and to a valid
- * code. The code must terminate with either an accept or reject.
- * 'valid' is an array for use by the routine (it must be at least
- * 'len' bytes long).
+ * code, that memory accesses are within valid ranges (to the
+ * extent that this can be checked statically; loads of packet
+ * data have to be, and are, also checked at run time), and that
+ * the code terminates with either an accept or reject.
*
* The kernel needs to be able to verify an application's filter code.
* Otherwise, a bogus program could easily crash the system.
@@ -480,38 +481,114 @@
struct bpf_insn *f;
int len;
{
- register int i;
- register struct bpf_insn *p;
+ u_int i, from;
+ const struct bpf_insn *p;
+
+ if (len == 0)
+ return 1;
+
+ if (len < 1 || len > BPF_MAXINSNS)
+ return 0;
for (i = 0; i < len; ++i) {
+ p = &f[i];
+ switch (BPF_CLASS(p->code)) {
/*
- * Check that that jumps are forward, and within
- * the code block.
+ * Check that memory operations use valid addresses.
*/
- p = &f[i];
- if (BPF_CLASS(p->code) == BPF_JMP) {
- register int from = i + 1;
-
- if (BPF_OP(p->code) == BPF_JA) {
- if (from + p->k >= (unsigned)len)
+ case BPF_LD:
+ case BPF_LDX:
+ switch (BPF_MODE(p->code)) {
+ case BPF_IMM:
+ break;
+ case BPF_ABS:
+ case BPF_IND:
+ case BPF_MSH:
+ /*
+ * More strict check with actual packet length
+ * is done runtime.
+ */
+#if 0
+ if (p->k >= bpf_maxbufsize)
+ return 0;
+#endif
+ break;
+ case BPF_MEM:
+ if (p->k >= BPF_MEMWORDS)
+ return 0;
+ break;
+ case BPF_LEN:
+ break;
+ default:
+ return 0;
+ }
+ break;
+ case BPF_ST:
+ case BPF_STX:
+ if (p->k >= BPF_MEMWORDS)
+ return 0;
+ break;
+ case BPF_ALU:
+ switch (BPF_OP(p->code)) {
+ case BPF_ADD:
+ case BPF_SUB:
+ case BPF_OR:
+ case BPF_AND:
+ case BPF_LSH:
+ case BPF_RSH:
+ case BPF_NEG:
+ break;
+ case BPF_DIV:
+ /*
+ * Check for constant division by 0.
+ */
+ if (BPF_RVAL(p->code) == BPF_K && p->k == 0)
return 0;
+ default:
+ return 0;
}
- else if (from + p->jt >= len || from + p->jf >= len)
+ break;
+ case BPF_JMP:
+ /*
+ * Check that jumps are within the code block,
+ * and that unconditional branches don't go
+ * backwards as a result of an overflow.
+ * Unconditional branches have a 32-bit offset,
+ * so they could overflow; we check to make
+ * sure they don't. Conditional branches have
+ * an 8-bit offset, and the from address is <=
+ * BPF_MAXINSNS, and we assume that BPF_MAXINSNS
+ * is sufficiently small that adding 255 to it
+ * won't overflow.
+ *
+ * We know that len is <= BPF_MAXINSNS, and we
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list