PERFORCE change 127902 for review

Kip Macy kmacy at FreeBSD.org
Sun Oct 21 13:30:06 PDT 2007


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

Change 127902 by kmacy at kmacy_home:ethng on 2007/10/21 20:29:39

	IFC 127901

Affected files ...

.. //depot/projects/ethng/src/Makefile#2 integrate
.. //depot/projects/ethng/src/UPDATING#5 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/BSD/Makefile#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/BSD/kupgrade#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/HISTORY#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/Makefile#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/ip_fil.c#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/iplang/Makefile#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/ipsend/iptests.c#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/ipsend/sock.c#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/l4check/Makefile#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/l4check/l4check.c#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/lib/Makefile#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/lib/alist_new.c#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/lib/ipft_tx.c#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/lib/printnat.c#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/lib/printpacket.c#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/lib/printpool_live.c#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/lib/printstate.c#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/man/ippool.5#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/md5.h#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/radix.c#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/radix_ipf.h#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/test/Makefile#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/test/dotest#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/test/expected/Makefile#1 branch
.. //depot/projects/ethng/src/contrib/ipfilter/test/expected/f11#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/test/expected/f24#1 branch
.. //depot/projects/ethng/src/contrib/ipfilter/test/expected/i19.dist#1 branch
.. //depot/projects/ethng/src/contrib/ipfilter/test/expected/i21#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/test/expected/in1#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/test/expected/in6#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/test/expected/ipv6.6#1 branch
.. //depot/projects/ethng/src/contrib/ipfilter/test/expected/n16#1 branch
.. //depot/projects/ethng/src/contrib/ipfilter/test/input/f11#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/test/input/f24#1 branch
.. //depot/projects/ethng/src/contrib/ipfilter/test/input/ipv6.6#1 branch
.. //depot/projects/ethng/src/contrib/ipfilter/test/input/l1#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/test/input/n16#1 branch
.. //depot/projects/ethng/src/contrib/ipfilter/test/nattest#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/test/regress/f24#1 branch
.. //depot/projects/ethng/src/contrib/ipfilter/test/regress/i21#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/test/regress/i3#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/test/regress/in1#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/test/regress/in6#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/test/regress/ipv6.6#1 branch
.. //depot/projects/ethng/src/contrib/ipfilter/test/regress/n16#1 branch
.. //depot/projects/ethng/src/contrib/ipfilter/test/test.format#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/tools/ipf_y.y#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/tools/ipfstat.c#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/tools/ipmon.c#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/tools/ipnat.c#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/tools/ipnat_y.y#2 integrate
.. //depot/projects/ethng/src/contrib/ipfilter/tools/lexer.c#2 integrate
.. //depot/projects/ethng/src/contrib/libpcap/pcap.h#3 integrate
.. //depot/projects/ethng/src/crypto/heimdal/appl/su/Makefile.am#2 integrate
.. //depot/projects/ethng/src/crypto/heimdal/appl/su/su.c#2 integrate
.. //depot/projects/ethng/src/crypto/openssl/ssl/d1_both.c#2 integrate
.. //depot/projects/ethng/src/crypto/openssl/ssl/dtls1.h#2 integrate
.. //depot/projects/ethng/src/crypto/openssl/ssl/ssl.h#2 integrate
.. //depot/projects/ethng/src/crypto/openssl/ssl/ssl_err.c#2 integrate
.. //depot/projects/ethng/src/etc/Makefile#4 integrate
.. //depot/projects/ethng/src/etc/cached.conf#2 delete
.. //depot/projects/ethng/src/etc/nscd.conf#1 branch
.. //depot/projects/ethng/src/etc/rc.d/amd#2 integrate
.. //depot/projects/ethng/src/etc/rc.d/kerberos#2 integrate
.. //depot/projects/ethng/src/etc/rc.d/ppp#3 integrate
.. //depot/projects/ethng/src/games/fortune/datfiles/fortunes#2 integrate
.. //depot/projects/ethng/src/games/fortune/datfiles/fortunes-o.real#2 integrate
.. //depot/projects/ethng/src/games/fortune/datfiles/limerick#2 integrate
.. //depot/projects/ethng/src/kerberos5/usr.bin/ksu/Makefile#2 integrate
.. //depot/projects/ethng/src/lib/libbsm/Makefile#2 integrate
.. //depot/projects/ethng/src/lib/libc/arm/Symbol.map#2 integrate
.. //depot/projects/ethng/src/lib/libc/ia64/Symbol.map#2 integrate
.. //depot/projects/ethng/src/lib/libc/net/nscache.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/powerpc/Symbol.map#2 integrate
.. //depot/projects/ethng/src/lib/libc/stdlib/atoi.3#2 integrate
.. //depot/projects/ethng/src/lib/libelf/elf.3#2 integrate
.. //depot/projects/ethng/src/lib/libelf/gelf_getphdr.3#2 integrate
.. //depot/projects/ethng/src/lib/libelf/gelf_newphdr.3#2 integrate
.. //depot/projects/ethng/src/lib/libpam/modules/pam_unix/Makefile#2 integrate
.. //depot/projects/ethng/src/lib/libstand/tftp.c#2 integrate
.. //depot/projects/ethng/src/lib/ncurses/ncurses/Makefile#2 integrate
.. //depot/projects/ethng/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#8 integrate
.. //depot/projects/ethng/src/sbin/geom/class/part/geom_part.c#2 integrate
.. //depot/projects/ethng/src/sbin/geom/class/part/gpart.8#2 integrate
.. //depot/projects/ethng/src/sbin/ipfw/ipfw.8#3 integrate
.. //depot/projects/ethng/src/sbin/ipfw/ipfw2.c#4 integrate
.. //depot/projects/ethng/src/sbin/mount/mount.8#2 integrate
.. //depot/projects/ethng/src/share/man/man5/nsswitch.conf.5#2 integrate
.. //depot/projects/ethng/src/share/man/man5/src.conf.5#4 integrate
.. //depot/projects/ethng/src/share/man/man9/kproc.9#1 branch
.. //depot/projects/ethng/src/share/man/man9/kthread.9#2 integrate
.. //depot/projects/ethng/src/share/mk/bsd.compat.mk#3 integrate
.. //depot/projects/ethng/src/share/mk/bsd.lib.mk#2 integrate
.. //depot/projects/ethng/src/share/mk/bsd.own.mk#3 integrate
.. //depot/projects/ethng/src/share/mk/bsd.symver.mk#2 integrate
.. //depot/projects/ethng/src/share/mk/version_gen.awk#2 integrate
.. //depot/projects/ethng/src/share/termcap/termcap.src#2 integrate
.. //depot/projects/ethng/src/sys/amd64/conf/GENERIC#6 integrate
.. //depot/projects/ethng/src/sys/arm/arm/cpufunc.c#3 integrate
.. //depot/projects/ethng/src/sys/arm/arm/cpufunc_asm_arm11.S#1 branch
.. //depot/projects/ethng/src/sys/arm/arm/cpufunc_asm_armv5.S#1 branch
.. //depot/projects/ethng/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch
.. //depot/projects/ethng/src/sys/arm/arm/identcpu.c#2 integrate
.. //depot/projects/ethng/src/sys/arm/at91/at91_mcireg.h#2 integrate
.. //depot/projects/ethng/src/sys/arm/include/armreg.h#2 integrate
.. //depot/projects/ethng/src/sys/arm/include/cpuconf.h#2 integrate
.. //depot/projects/ethng/src/sys/arm/include/cpufunc.h#2 integrate
.. //depot/projects/ethng/src/sys/cam/cam_xpt.c#2 integrate
.. //depot/projects/ethng/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate
.. //depot/projects/ethng/src/sys/compat/opensolaris/sys/proc.h#3 integrate
.. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/fil.c#2 integrate
.. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate
.. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate
.. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate
.. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate
.. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate
.. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate
.. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate
.. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate
.. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate
.. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate
.. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate
.. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate
.. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate
.. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate
.. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate
.. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate
.. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate
.. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate
.. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate
.. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/ipl.h#2 integrate
.. //depot/projects/ethng/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate
.. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate
.. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate
.. //depot/projects/ethng/src/sys/contrib/pf/net/pf.c#3 integrate
.. //depot/projects/ethng/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/aac/aac.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/acpica/acpi_thermal.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate
.. //depot/projects/ethng/src/sys/dev/bktr/msp34xx.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/ciss/ciss.c#4 integrate
.. //depot/projects/ethng/src/sys/dev/fdc/fdc.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/firewire/firewire.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/flash/at45d.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/hptmv/entry.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/hwpmc/hwpmc_logging.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/if_ndis/if_ndis.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/ipmi/ipmi_kcs.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/ipmi/ipmi_smic.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/ipmi/ipmi_ssif.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/iscsi/initiator/isc_sm.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/iscsi/initiator/isc_soc.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/isp/isp_freebsd.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/iwi/if_iwi.c#4 integrate
.. //depot/projects/ethng/src/sys/dev/md/md.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/mmc/mmcsd.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/mpt/mpt.h#3 integrate
.. //depot/projects/ethng/src/sys/dev/mpt/mpt_cam.c#4 integrate
.. //depot/projects/ethng/src/sys/dev/mpt/mpt_raid.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/ofw/ofw_disk.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/pccbb/pccbb.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/pccbb/pccbb_pci.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/random/harvest.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/random/randomdev_soft.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/sound/midi/sequencer.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/sound/pci/hda/hdac.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/usb/if_zyd.c#6 integrate
.. //depot/projects/ethng/src/sys/dev/usb/uchcom.c#1 branch
.. //depot/projects/ethng/src/sys/dev/usb/usb.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/usb/usb_port.h#2 integrate
.. //depot/projects/ethng/src/sys/dev/usb/usbdevs#5 integrate
.. //depot/projects/ethng/src/sys/dev/utopia/utopia.c#2 integrate
.. //depot/projects/ethng/src/sys/fs/msdosfs/msdosfs_denode.c#3 integrate
.. //depot/projects/ethng/src/sys/fs/msdosfs/msdosfs_lookup.c#4 integrate
.. //depot/projects/ethng/src/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate
.. //depot/projects/ethng/src/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate
.. //depot/projects/ethng/src/sys/geom/bde/g_bde.c#2 integrate
.. //depot/projects/ethng/src/sys/geom/bde/g_bde_work.c#2 integrate
.. //depot/projects/ethng/src/sys/geom/eli/g_eli.c#2 integrate
.. //depot/projects/ethng/src/sys/geom/journal/g_journal.c#2 integrate
.. //depot/projects/ethng/src/sys/geom/mirror/g_mirror.c#2 integrate
.. //depot/projects/ethng/src/sys/geom/multipath/g_multipath.c#2 integrate
.. //depot/projects/ethng/src/sys/geom/part/g_part.c#2 integrate
.. //depot/projects/ethng/src/sys/geom/part/g_part.h#2 integrate
.. //depot/projects/ethng/src/sys/geom/part/g_part_apm.c#2 integrate
.. //depot/projects/ethng/src/sys/geom/part/g_part_gpt.c#2 integrate
.. //depot/projects/ethng/src/sys/geom/raid3/g_raid3.c#2 integrate
.. //depot/projects/ethng/src/sys/geom/vinum/geom_vinum_drive.c#2 integrate
.. //depot/projects/ethng/src/sys/geom/vinum/geom_vinum_init.c#2 integrate
.. //depot/projects/ethng/src/sys/geom/vinum/geom_vinum_plex.c#2 integrate
.. //depot/projects/ethng/src/sys/geom/vinum/geom_vinum_volume.c#2 integrate
.. //depot/projects/ethng/src/sys/i386/bios/apm.c#2 integrate
.. //depot/projects/ethng/src/sys/i386/conf/GENERIC#4 integrate
.. //depot/projects/ethng/src/sys/i386/i386/in_cksum.c#2 integrate
.. //depot/projects/ethng/src/sys/i386/include/in_cksum.h#2 integrate
.. //depot/projects/ethng/src/sys/kern/init_main.c#4 integrate
.. //depot/projects/ethng/src/sys/kern/kern_acct.c#3 integrate
.. //depot/projects/ethng/src/sys/kern/kern_fork.c#3 integrate
.. //depot/projects/ethng/src/sys/kern/kern_idle.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/kern_intr.c#3 integrate
.. //depot/projects/ethng/src/sys/kern/kern_kthread.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/kern_shutdown.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/subr_taskqueue.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/syscalls.master#3 integrate
.. //depot/projects/ethng/src/sys/kern/vfs_aio.c#3 integrate
.. //depot/projects/ethng/src/sys/kern/vfs_bio.c#3 integrate
.. //depot/projects/ethng/src/sys/kern/vfs_subr.c#4 integrate
.. //depot/projects/ethng/src/sys/modules/uchcom/Makefile#1 branch
.. //depot/projects/ethng/src/sys/net/bpf.h#2 integrate
.. //depot/projects/ethng/src/sys/net/ethernet.h#2 integrate
.. //depot/projects/ethng/src/sys/net/if_bridge.c#3 integrate
.. //depot/projects/ethng/src/sys/net/if_ethersubr.c#4 integrate
.. //depot/projects/ethng/src/sys/net/if_lagg.c#4 integrate
.. //depot/projects/ethng/src/sys/net/if_vlan.c#2 integrate
.. //depot/projects/ethng/src/sys/netgraph/netgraph.h#2 integrate
.. //depot/projects/ethng/src/sys/netgraph/ng_base.c#3 integrate
.. //depot/projects/ethng/src/sys/netgraph/ng_socket.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet/ip.h#2 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_bsd_addr.c#3 integrate
.. //depot/projects/ethng/src/sys/netinet/tcp_syncache.c#3 integrate
.. //depot/projects/ethng/src/sys/netinet/tcp_usrreq.c#5 integrate
.. //depot/projects/ethng/src/sys/netsmb/smb_iod.c#2 integrate
.. //depot/projects/ethng/src/sys/nfs4client/nfs4_vfsops.c#3 integrate
.. //depot/projects/ethng/src/sys/nfsclient/nfs_nfsiod.c#3 integrate
.. //depot/projects/ethng/src/sys/nfsclient/nfs_vfsops.c#3 integrate
.. //depot/projects/ethng/src/sys/nfsserver/nfs_serv.c#2 integrate
.. //depot/projects/ethng/src/sys/opencrypto/crypto.c#2 integrate
.. //depot/projects/ethng/src/sys/security/audit/audit_worker.c#2 integrate
.. //depot/projects/ethng/src/sys/security/mac/mac_framework.h#3 integrate
.. //depot/projects/ethng/src/sys/security/mac/mac_policy.h#3 integrate
.. //depot/projects/ethng/src/sys/security/mac/mac_posix_sem.c#2 integrate
.. //depot/projects/ethng/src/sys/security/mac_biba/mac_biba.c#3 integrate
.. //depot/projects/ethng/src/sys/security/mac_mls/mac_mls.c#3 integrate
.. //depot/projects/ethng/src/sys/security/mac_stub/mac_stub.c#3 integrate
.. //depot/projects/ethng/src/sys/security/mac_test/mac_test.c#3 integrate
.. //depot/projects/ethng/src/sys/sun4v/sun4v/simdisk.c#2 integrate
.. //depot/projects/ethng/src/sys/sys/apm.h#2 integrate
.. //depot/projects/ethng/src/sys/sys/gpt.h#2 integrate
.. //depot/projects/ethng/src/sys/sys/kthread.h#2 integrate
.. //depot/projects/ethng/src/sys/sys/param.h#6 integrate
.. //depot/projects/ethng/src/sys/sys/vnode.h#2 integrate
.. //depot/projects/ethng/src/sys/ufs/ffs/ffs_softdep.c#2 integrate
.. //depot/projects/ethng/src/sys/vm/vm_mmap.c#3 integrate
.. //depot/projects/ethng/src/sys/vm/vm_object.c#3 integrate
.. //depot/projects/ethng/src/sys/vm/vm_zeroidle.c#2 integrate
.. //depot/projects/ethng/src/tools/build/options/WITHOUT_NS_CACHING#2 integrate
.. //depot/projects/ethng/src/usr.bin/fmt/fmt.c#2 integrate
.. //depot/projects/ethng/src/usr.bin/lex/lib/Makefile#2 integrate
.. //depot/projects/ethng/src/usr.bin/locate/locate/locate.rc#2 integrate
.. //depot/projects/ethng/src/usr.bin/locate/locate/updatedb.sh#3 integrate
.. //depot/projects/ethng/src/usr.bin/makewhatis/makewhatis.c#2 integrate
.. //depot/projects/ethng/src/usr.bin/netstat/sctp.c#4 integrate
.. //depot/projects/ethng/src/usr.bin/nfsstat/nfsstat.1#2 integrate
.. //depot/projects/ethng/src/usr.bin/nfsstat/nfsstat.c#2 integrate
.. //depot/projects/ethng/src/usr.bin/su/su.c#2 integrate
.. //depot/projects/ethng/src/usr.bin/tail/read.c#2 integrate
.. //depot/projects/ethng/src/usr.sbin/adduser/adduser.8#2 integrate
.. //depot/projects/ethng/src/usr.sbin/adduser/adduser.sh#2 integrate
.. //depot/projects/ethng/src/usr.sbin/adduser/rmuser.sh#2 integrate
.. //depot/projects/ethng/src/usr.sbin/mountd/mountd.8#2 integrate
.. //depot/projects/ethng/src/usr.sbin/mountd/mountd.c#2 integrate
.. //depot/projects/ethng/src/usr.sbin/pkg_install/lib/lib.h#2 integrate

Differences ...

==== //depot/projects/ethng/src/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.341 2007/05/16 08:46:35 des Exp $
+# $FreeBSD: src/Makefile,v 1.342 2007/10/18 08:41:52 delphij Exp $
 #
 # The user-driven targets are:
 #
@@ -147,14 +147,14 @@
 .if ${.CURDIR} == ${.OBJDIR} || ${.CURDIR}/obj == ${.OBJDIR}
 .if exists(${BW_CANONICALOBJDIR}/)
 	-rm -rf ${BW_CANONICALOBJDIR}/*
-	chflags -R 0 ${BW_CANONICALOBJDIR}
+	-chflags -R 0 ${BW_CANONICALOBJDIR}
 	rm -rf ${BW_CANONICALOBJDIR}/*
 .endif
 	#   To be safe in this case, fall back to a 'make cleandir'
 	${_+_}@cd ${.CURDIR}; ${_MAKE} cleandir
 .else
 	-rm -rf ${.OBJDIR}/*
-	chflags -R 0 ${.OBJDIR}
+	-chflags -R 0 ${.OBJDIR}
 	rm -rf ${.OBJDIR}/*
 .endif
 

==== //depot/projects/ethng/src/UPDATING#5 (text+ko) ====

@@ -21,6 +21,14 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20071020:
+	The misnamed kthread_create() and friends have been renamed
+	to kproc_create() etc. Many of the callers already
+	used kproc_start()..
+	I will return kthread_create() and friends in a while
+	with implementations that actually create threads, not procs.
+	Renaming corresponds with version 800002.
+
 20071010:
 	RELENG_7 branched.
 
@@ -913,4 +921,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.509 2007/10/12 04:48:58 kevlo Exp $
+$FreeBSD: src/UPDATING,v 1.510 2007/10/21 04:27:07 julian Exp $

==== //depot/projects/ethng/src/contrib/ipfilter/BSD/Makefile#2 (text+ko) ====

@@ -485,13 +485,21 @@
 		cp if_ipl.o /lkm; \
 	fi
 	-if [ -d /modules -a -f ipf.ko ] ; then \
-		cp ipf.ko /modules; \
+		if [ -f /modules/ipl.ko ] ; then \
+			cp ipf.ko /modules/ipl.ko; \
+		else \
+			cp ipf.ko /modules; \
+		fi \
 	fi
 	-if [ -d /modules -a -f ipfrule.ko ] ; then \
 		cp ipfrule.ko /modules; \
 	fi
 	-if [ -d /boot/kernel -a -f ipf.ko ] ; then \
-		cp ipf.ko /boot/kernel; \
+		if [ -f /boot/kernel/ipl.ko ] ; then \
+			cp ipf.ko /boot/kernel/ipl.ko; \
+		else \
+			cp ipf.ko /boot/kernel; \
+		fi \
 	fi
 	-if [ -d /boot/kernel -a -f ipfrule.ko ] ; then \
 		cp ipfrule.ko /boot/kernel; \

==== //depot/projects/ethng/src/contrib/ipfilter/BSD/kupgrade#2 (text+ko) ====

@@ -32,11 +32,15 @@
 fi
  
 if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then
-	echo "Please do a build of ipfilter and then run the following"
-	echo "command to build extra files:"
-	echo
-	echo "make ip_rules.c"
-	exit 1
+	echo "Trying to build ip_rules.c and ip_rules.h"
+	make ip_rules.c
+	if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then
+		echo "Please do a build of ipfilter and then run the following"
+		echo "command to build extra files:"
+		echo
+		echo "make ip_rules.c"
+		exit 1
+	fi
 fi
 
 echo -n "Installing "

==== //depot/projects/ethng/src/contrib/ipfilter/HISTORY#2 (text+ko) ====

@@ -10,12 +10,110 @@
 # and especially those who have found the time to port IP Filter to new
 # platforms.
 #
+4.1.28 - Release 16 October 2007
+
+backout changes (B1) & (B2) as they've caused NAT entries to persist for
+too long and possibly other side effects.
+
+Still need to compile in our own radix.c for Solaris as the one in S10U4
+has a different alignment of structure members (causes panic)
+
+keep state doesn't work with multicast/broadcast packets (makes UPnP easier)
+
+ippool -l may only lists every 2nd pool's contents
+
+4.1.27 - Released 29 September 2007
+
+SunOS5/replace script does not deal with i386 systems that have the
+i86/amd64 directory pair.
+
+make BSD/kupgrade try to build ip_rules.[ch] before complaining
+
+Need to look for ipl.ko LKM on FreeBSD, not just ipf.ko
+
+Cleanup SunOS5 Makefile pieces, removing CPU, sunos5x86; buildsunos needs
+to drive 32bit cc builds differently for sparc/i386 now.
+
+Update instructions for rebuilding FreeBSD kernels
+
+Make the target "freebsd" work for building ipfilter
+
+destroying NAT entries for blocked packets can lead to NAT table entry leak,
+provide a counter of orphan'd NAT entries to track this problem.
+
+4.1.26 - Released 24 September 2007
+
+Fix build problem for Solaris prior to S10U4
+
+4.1.25 - Released 20 September 2007
+
+stepping through structures with ioctls can lead to the wrong things
+being free'd and panics
+
+if a NAT entry (such as an rdr) is created but the packet ends up being
+blocked, tear down the NAT entry.
+
+fix fragment cache preventing keep state from functioning
+
+fix handling of \ to indicate a continued line in .conf files
+
+include port ranges in the allowed input for ipf when using "port = ()"
+
+only advance TCP state for packets on the leading edge of the window. (B1)
+
+using ipnat -l can lead to memory corruption in high stress situations
+
+track TCP sequence numbers with NAT so that it can do timeout advances
+correctly inline with state
+
+ICMP checksums for some redirect'd packets are not adjusted correctly.
+
+IPv6 address components need to be explicitly cast to a 32bit pointer
+boundary so that compilers don't try to access them as two 64bit
+pieces (no guarantee is made that an Ipv6 address is on a 64bit
+aligned address)
+
+filling up the ipauth packet queue can lead to no more packets being
+processed.
+
+locking used to deref a nat entry causes a significant performance hit
+
+m_pulldown isn't properly handled, leading to possible panics with ICMPv6
+packets
+
+IPv6 fragment handling doesn't allow for "keep frag" to work
+
+build on Solaris10 Update4 with pfhooks in the kernel
+
+logging of Ipv6 packets with extension headers fix - Miroslaw Luc
+
+4.1.24 - Released 8 July 2007
+
+patch from Stuart Remphrey to address recursive mutex lock with TCP state
+
+add hash table bucket stats display to ipnat -s
+
+give ASSERT some teeth for user compiles
+
+initialising ipf_global, ipf_frcache, ipf_mutex should all be done very
+early on
+
+do some caddr_t cleanup, where possible
+
+fr_ref no longer tracks the number of children rules in a group for head rules
+
+make sure all BCOPY* have a value assigned to something
+
+fix possible use of icmp pointer after pullup makes it invalid
+
+resolve compile problems related to FreeBSD tree
+
 4.1.23 - Released 31 May 2007
 
 NAT was not always correctly fixing ICMP headers for errors
 
 some TCP state steps when closing do not update timeouts, leading to
-them being removed prematurely.
+them being removed prematurely. (B2)
 
 fix compilation problems for netbsd 4.99
 

==== //depot/projects/ethng/src/contrib/ipfilter/Makefile#2 (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.7 2007/06/04 02:54:31 darrenr Exp $
-# Id: Makefile,v 2.76.2.19 2006/03/17 10:38:38 darrenr Exp $
+# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.8 2007/10/18 21:52:11 darrenr Exp $
+# Id: Makefile,v 2.76.2.24 2007/09/26 10:04:03 darrenr Exp $
 #
 SHELL=/bin/sh
 BINDEST=/usr/local/bin
@@ -132,10 +132,7 @@
 	@echo "openbsd	- compile for OpenBSD"
 	@echo "freebsd20	- compile for FreeBSD 2.0, 2.1 or earlier"
 	@echo "freebsd22	- compile for FreeBSD-2.2 or greater"
-	@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 "freebsd  - compile for all other versions of FreeBSD"
 	@echo "bsd	- compile for generic 4.4BSD systems"
 	@echo "bsdi	- compile for BSD/OS"
 	@echo "irix	- compile for SGI IRIX"
@@ -152,6 +149,7 @@
 	else echo test directory not present, sorry; fi
 
 include:
+	-mkdir -p net netinet
 	if [ ! -f netinet/done ] ; then \
 		(cd netinet; ln -s ../*.h .; ln -s ../ip_*_pxy.c .;); \
 		(cd netinet; ln -s ../ipsend/tcpip.h tcpip.h); \
@@ -167,6 +165,9 @@
 	MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" BPFILTER=$(BPFILTER) \
 		CC="$(CC)" DEBUG="$(DEBUG)" ./buildsunos
 
+freebsd:
+	make freebsd`uname -r|cut -c1`
+
 freebsd22: include
 	make setup "TARGOS=BSD" "CPUDIR=$(CPUDIR)"
 	-rm -f BSD/$(CPUDIR)/ioconf.h
@@ -351,13 +352,9 @@
 	(cd SunOS4; make -f Makefile.ipsend build "CC=$(CC)" TOP=.. $(DEST) $(MFLAGS); cd ..)
 
 sunos5 solaris2: null
-	(cd SunOS5/$(CPUDIR); $(MAKE) build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS) "SOLARIS2=$(SOLARIS2)" "CPU=-Dsparc -D__sparc__"; cd ..)
+	(cd SunOS5/$(CPUDIR); $(MAKE) build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS) "SOLARIS2=$(SOLARIS2)"; cd ..)
 	(cd SunOS5/$(CPUDIR); $(MAKE) -f Makefile.ipsend build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS); cd ..)
 
-sunos5x86 solaris2x86: null
-	(cd SunOS5/$(CPUDIR); make build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS) "SOLARIS2=$(SOLARIS2)" "CPU=-Di86pc -Di386 -D__i386__"; cd ..)
-	(cd SunOS5/$(CPUDIR); make -f Makefile.ipsend build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS); cd ..)
-
 linux: include
 	(cd Linux; make build LINUX=$(LINUX) TOP=.. "DEBUG=-g" "CC=$(CC)" $(MFLAGS) OBJ=$(CPUDIR) LINUXKERNEL=$(LINUXKERNEL); cd ..)
 	(cd Linux; make ipflkm LINUX=$(LINUX) TOP=.. "DEBUG=-g" "CC=$(CC)" $(MFLAGS) OBJ=$(CPUDIR) LINUXKERNEL=$(LINUXKERNEL) WORKDIR=`pwd`; cd ..)
@@ -374,7 +371,7 @@
 	(cd SunOS4; $(MAKE) CPU=$(CPU) TOP=.. install)
 
 install-sunos5: solaris null
-	(cd SunOS5; $(MAKE) CPU=$(CPU) TOP=.. install)
+	(cd SunOS5; $(MAKE) TOP=.. install)
 
 install-aix:
 	(cd AIX/`AIX/cpurev`; make install "TOP=../.." $(MFLAGS); cd ..)

==== //depot/projects/ethng/src/contrib/ipfilter/ip_fil.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.5 2007/06/04 02:54:31 darrenr Exp $	*/
+/*	$FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.6 2007/10/18 21:52:11 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-2001 by Darren Reed.
@@ -7,7 +7,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_fil.c	2.41 6/5/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.133.2.16 2007/05/28 11:56:22 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.133.2.18 2007/09/09 11:32:05 darrenr Exp $";
 #endif
 
 #ifndef	SOLARIS
@@ -81,7 +81,7 @@
 #include <sys/hashing.h>
 # endif
 #endif
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(SOLARIS2)
 # include "radix_ipf.h"
 #endif
 #ifndef __osf__
@@ -390,7 +390,7 @@
 		*addr++ = '\0';
 
 	for (ifpp = ifneta; ifpp && (ifp = *ifpp); ifpp++) {
-		COPYIFNAME(ifp, ifname);
+		COPYIFNAME(v, ifp, ifname);
 		if (!strcmp(name, ifname)) {
 			if (addr != NULL)
 				fr_setifpaddr(ifp, addr);
@@ -429,6 +429,9 @@
 	}
 	ifp = ifneta[nifs - 1];
 
+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+	TAILQ_INIT(&ifp->if_addrlist);
+#endif
 #if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \
     (defined(OpenBSD) && (OpenBSD >= 199603)) || defined(linux) || \
     (defined(__FreeBSD__) && (__FreeBSD_version >= 501113))

==== //depot/projects/ethng/src/contrib/ipfilter/iplang/Makefile#2 (text+ko) ====

@@ -3,20 +3,21 @@
 #
 #CC=gcc -Wuninitialized -Wstrict-prototypes -Werror -O
 CFLAGS=-I..
+CCARGS=$(DEBUG) -I. -I.. $(CFLAGS) -I$(DESTDIR) -I$(DESTDIR)/.. -I../ipsend
 
 all: $(DESTDIR)/iplang_y.o $(DESTDIR)/iplang_l.o
 
 $(DESTDIR)/iplang_y.o: $(DESTDIR)/iplang_y.c
-	$(CC) $(DEBUG) -I. -I.. -I$(DESTDIR) -I../ipsend $(CFLAGS) $(LINUX) -c $(DESTDIR)/iplang_y.c -o $@
+	$(CC) $(CCARGS) $(LINUX) -c $(DESTDIR)/iplang_y.c -o $@
 
 $(DESTDIR)/iplang_l.o: $(DESTDIR)/iplang_l.c
-	$(CC) $(DEBUG) -I. -I.. -I$(DESTDIR) -I../ipsend $(CFLAGS) $(LINUX) -c $(DESTDIR)/iplang_l.c -o $@
+	$(CC) $(CCARGS) $(LINUX) -c $(DESTDIR)/iplang_l.c -o $@
 
 iplang_y.o: iplang_y.c
-	$(CC) $(DEBUG) -I. -I.. -I../ipsend $(CFLAGS) $(LINUX) -c $< -o $@
+	$(CC) $(CCARGS) $< -o $@
 
 iplang_l.o: iplang_l.c
-	$(CC) $(DEBUG) -I. -I.. -I../ipsend $(CFLAGS) $(LINUX) -c $< -o $@
+	$(CC) $(CCARGS) $< -o $@
 
 $(DESTDIR)/iplang_l.c: iplang_l.l $(DESTDIR)/iplang_y.h
 	lex iplang_l.l

==== //depot/projects/ethng/src/contrib/ipfilter/ipsend/iptests.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/contrib/ipfilter/ipsend/iptests.c,v 1.13 2007/06/04 02:54:31 darrenr Exp $	*/
+/*	$FreeBSD: src/contrib/ipfilter/ipsend/iptests.c,v 1.14 2007/10/18 21:52:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 1993-1998 by Darren Reed.
@@ -8,7 +8,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "%W% %G% (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: iptests.c,v 2.8.2.8 2007/02/17 12:41:51 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: iptests.c,v 2.8.2.9 2007/09/13 07:19:34 darrenr Exp $";
 #endif
 #include <sys/param.h>
 #include <sys/types.h>
@@ -22,6 +22,9 @@
 #endif
 #include <sys/time.h>
 #if !defined(__osf__)
+# ifdef __NetBSD__ 
+#  include <machine/lock.h>
+# endif
 # define _KERNEL
 # define KERNEL
 # if !defined(solaris) && !defined(linux) && !defined(__sgi) && !defined(hpux)
@@ -1097,7 +1100,8 @@
 	struct tcpcb *tcbp, tcb;
 	struct tcpiphdr ti;
 	struct sockaddr_in sin;
-	int fd, slen;
+	int fd;
+	socklen_t slen;
 
 	bzero((char *)&sin, sizeof(sin));
 

==== //depot/projects/ethng/src/contrib/ipfilter/ipsend/sock.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/ipfilter/ipsend/sock.c,v 1.18 2007/06/04 02:54:31 darrenr Exp $ */
+/* $FreeBSD: src/contrib/ipfilter/ipsend/sock.c,v 1.19 2007/10/18 21:52:12 darrenr Exp $ */
 /*
  * sock.c (C) 1995-1998 Darren Reed
  *
@@ -7,7 +7,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)sock.c	1.2 1/11/96 (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: sock.c,v 2.8.4.6 2007/02/17 12:41:51 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: sock.c,v 2.8.4.7 2007/09/13 07:19:34 darrenr Exp $";
 #endif
 #include <sys/param.h>
 #include <sys/types.h>
@@ -30,6 +30,9 @@
 # include <sys/dir.h>
 #endif
 #if !defined(__osf__)
+# ifdef __NetBSD__ 
+#  include <machine/lock.h>
+# endif
 # define _KERNEL
 # define	KERNEL
 # ifdef	ultrix
@@ -385,7 +388,8 @@
 {
 	struct	sockaddr_in	rsin, lsin;
 	struct	tcpcb	*t, tcb;
-	int	fd, nfd, len;
+	int	fd, nfd;
+	socklen_t len;
 
 	printf("Dest. Port: %d\n", ti->ti_dport);
 

==== //depot/projects/ethng/src/contrib/ipfilter/l4check/Makefile#2 (text+ko) ====

@@ -4,7 +4,7 @@
 all: l4check
 
 l4check: l4check.c
-	$(CC) -g -I.. $(CFLAGS) $(LIBS) l4check.c -o $@
+	$(CC) -g -I.. -Wall $(CFLAGS) $(LIBS) l4check.c -o $@
 
 clean:
 	/bin/rm -f l4check

==== //depot/projects/ethng/src/contrib/ipfilter/l4check/l4check.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/contrib/ipfilter/l4check/l4check.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $	*/
+/*	$FreeBSD: src/contrib/ipfilter/l4check/l4check.c,v 1.3 2007/10/18 21:52:12 darrenr Exp $	*/
 
 /*
  * (C)Copyright March, 2000 - Darren Reed.
@@ -27,6 +27,7 @@
 #include "ip_compat.h"
 #include "ip_fil.h"
 #include "ip_nat.h"
+#include "ipl.h"
 
 #include "ipf.h"
 
@@ -98,13 +99,21 @@
 void addnat(l4)
 l4cfg_t *l4;
 {
+
 	ipnat_t *ipn = &l4->l4_nat;
 
-	printf("Add NAT rule for %s/%#x,%u -> ", inet_ntoa(ipn->in_out[0]),
+	printf("Add NAT rule for %s/%#x,%u -> ", inet_ntoa(ipn->in_out[0].in4),
 		ipn->in_outmsk, ntohs(ipn->in_pmin));
-	printf("%s,%u\n", inet_ntoa(ipn->in_in[0]), ntohs(ipn->in_pnext));
+	printf("%s,%u\n", inet_ntoa(ipn->in_in[0].in4), ntohs(ipn->in_pnext));
 	if (!(opts & OPT_DONOTHING)) {
-		if (ioctl(natfd, SIOCADNAT, &ipn) == -1)
+		ipfobj_t obj;
+
+		bzero(&obj, sizeof(obj));
+		obj.ipfo_rev = IPFILTER_VERSION;
+		obj.ipfo_size = sizeof(*ipn);
+		obj.ipfo_ptr = ipn;
+
+		if (ioctl(natfd, SIOCADNAT, &obj) == -1)
 			perror("ioctl(SIOCADNAT)");
 	}
 }
@@ -116,9 +125,16 @@
 	ipnat_t *ipn = &l4->l4_nat;
 
 	printf("Remove NAT rule for %s/%#x,%u -> ",
-		inet_ntoa(ipn->in_out[0]), ipn->in_outmsk, ipn->in_pmin);
-	printf("%s,%u\n", inet_ntoa(ipn->in_in[0]), ipn->in_pnext);
+		inet_ntoa(ipn->in_out[0].in4), ipn->in_outmsk, ipn->in_pmin);
+	printf("%s,%u\n", inet_ntoa(ipn->in_in[0].in4), ipn->in_pnext);
 	if (!(opts & OPT_DONOTHING)) {
+		ipfobj_t obj;
+
+		bzero(&obj, sizeof(obj));
+		obj.ipfo_rev = IPFILTER_VERSION;
+		obj.ipfo_size = sizeof(*ipn);
+		obj.ipfo_ptr = ipn;
+
 		if (ioctl(natfd, SIOCRMNAT, &ipn) == -1)
 			perror("ioctl(SIOCRMNAT)");
 	}
@@ -178,7 +194,6 @@
 void writefd(l4)
 l4cfg_t *l4;
 {
-	char buf[80], *ptr;
 	int n, i, fd;
 
 	fd = l4->l4_fd;
@@ -410,7 +425,6 @@
 	struct servent *sp;
 	struct hostent *hp;
 	char *host, *port;
-	struct in_addr ip;
 
 	host = str;
 	port = strchr(host, ',');
@@ -555,7 +569,8 @@
 				break;
 			}
 
-			strncpy(ipn->in_ifname, s, sizeof(ipn->in_ifname));
+			strncpy(ipn->in_ifnames[0], s, LIFNAMSIZ);
+			strncpy(ipn->in_ifnames[1], s, LIFNAMSIZ);
 			if (!gethostport(t, num, &ipn->in_outip,
 					 &ipn->in_pmin)) {
 				errtxt = line;
@@ -567,11 +582,11 @@
 			if (opts & OPT_VERBOSE)
 				fprintf(stderr,
 					"Interface %s %s/%#x port %u\n",
-					ipn->in_ifname,
-					inet_ntoa(ipn->in_out[0]),
+					ipn->in_ifnames[0],
+					inet_ntoa(ipn->in_out[0].in4),
 					ipn->in_outmsk, ipn->in_pmin);
 		} else if (!strcasecmp(t, "remote")) {
-			if (!*ipn->in_ifname) {
+			if (!*ipn->in_ifnames[0]) {
 				fprintf(stderr,
 					"%d: ifname not set prior to remote\n",
 					num);
@@ -606,7 +621,7 @@
 				break;
 			}
 			bcopy((char *)&template, (char *)l4, sizeof(*l4));
-			l4->l4_sin.sin_addr = ipn->in_in[0];
+			l4->l4_sin.sin_addr = ipn->in_in[0].in4;
 			l4->l4_sin.sin_port = ipn->in_pnext;
 			l4->l4_next = l4list;
 			l4list = l4;
@@ -793,7 +808,7 @@
 	}
 
 	if (!(opts & OPT_DONOTHING)) {
-		natfd = open(IPL_NAT, O_RDWR);
+		natfd = open(IPNAT_NAME, O_RDWR);
 		if (natfd == -1) {
 			perror("open(IPL_NAT)");
 			exit(1);
@@ -804,4 +819,6 @@
 		fprintf(stderr, "Starting...\n");
 	while (runconfig() == 0)
 		;
+
+	exit(1);
 }

==== //depot/projects/ethng/src/contrib/ipfilter/lib/Makefile#2 (text+ko) ====

@@ -3,7 +3,7 @@
 # 
 # See the IPFILTER.LICENCE file for details on licencing.  
 #   
-# $Id: Makefile,v 1.41.2.13 2007/05/10 06:02:19 darrenr Exp $ 
+# $Id: Makefile,v 1.41.2.14 2007/09/21 08:30:43 darrenr Exp $ 
 #     
 INCDEP=$(TOP)/ip_compat.h $(TOP)/ip_fil.h $(TOP)/ipf.h
 
@@ -135,8 +135,6 @@
 	$(CC) $(CCARGS) -c $(LIBSRC)/fill6bits.c -o $@
 $(DEST)/flags.o: $(LIBSRC)/flags.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/flags.c -o $@
-$(DEST)/getline.o: $(LIBSRC)/getline.c $(INCDEP)
-	$(CC) $(CCARGS) -c $(LIBSRC)/getline.c -o $@
 $(DEST)/gethost.o: $(LIBSRC)/gethost.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/gethost.c -o $@
 $(DEST)/getifname.o: $(LIBSRC)/getifname.c $(INCDEP)
@@ -218,10 +216,6 @@
 	$(CC) $(CCARGS) -c $(LIBSRC)/optvalue.c -o $@
 $(DEST)/portname.o: $(LIBSRC)/portname.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/portname.c -o $@
-$(DEST)/portnum.o: $(LIBSRC)/portnum.c $(INCDEP)
-	$(CC) $(CCARGS) -c $(LIBSRC)/portnum.c -o $@
-$(DEST)/ports.o: $(LIBSRC)/ports.c $(INCDEP)
-	$(CC) $(CCARGS) -c $(LIBSRC)/ports.c -o $@
 $(DEST)/print_toif.o: $(LIBSRC)/print_toif.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/print_toif.c -o $@
 $(DEST)/printactivenat.o: $(LIBSRC)/printactivenat.c $(INCDEP)

==== //depot/projects/ethng/src/contrib/ipfilter/lib/alist_new.c#2 (text+ko) ====

@@ -3,7 +3,7 @@
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: alist_new.c,v 1.1.2.2 2006/08/25 22:43:21 darrenr Exp $
+ * $Id: alist_new.c,v 1.1.2.3 2007/06/06 08:05:33 darrenr Exp $
  */
 
 #include "ipf.h"
@@ -53,12 +53,14 @@
 	}
 
 	if (gethost(host, &al->al_addr) == -1) {
-		*slash = '/';
+		if (slash != NULL)
+			*slash = '/';
 		fprintf(stderr, "Cannot parse hostname\n");
 		free(al);
 		return NULL;
 	}
 	al->al_mask = htonl(mask);
-	*slash = '/';
+	if (slash != NULL)
+		*slash = '/';
 	return al;
 }

==== //depot/projects/ethng/src/contrib/ipfilter/lib/ipft_tx.c#2 (text+ko) ====

@@ -1,15 +1,15 @@
-/*	$FreeBSD: src/contrib/ipfilter/lib/ipft_tx.c,v 1.6 2007/06/04 02:54:32 darrenr Exp $	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/ipft_tx.c,v 1.7 2007/10/18 21:52:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2000-2006 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: ipft_tx.c,v 1.15.2.9 2006/06/16 17:21:04 darrenr Exp $
+ * $Id: ipft_tx.c,v 1.15.2.10 2007/09/03 21:54:44 darrenr Exp $
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)ipft_tx.c	1.7 6/5/96 (C) 1993 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ipft_tx.c,v 1.15.2.9 2006/06/16 17:21:04 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: ipft_tx.c,v 1.15.2.10 2007/09/03 21:54:44 darrenr Exp $";
 #endif
 
 #include <ctype.h>
@@ -259,19 +259,30 @@
 	}
 	ip->ip_dst.s_addr = tx_hostnum(*cpp, &r);
 	cpp++;
-	if (*cpp && ip->ip_p == IPPROTO_TCP) {
-		char	*s, *t;
+	if (ip->ip_p == IPPROTO_TCP) {
+		if (*cpp != NULL) {
+			char	*s, *t;
+
+			tcp->th_flags = 0;
+			for (s = *cpp; *s; s++)
+				if ((t  = strchr(myflagset, *s)))
+					tcp->th_flags |= myflags[t-myflagset];
+			if (tcp->th_flags)
+				cpp++;
+		}
 
-		tcp->th_flags = 0;
-		for (s = *cpp; *s; s++)
-			if ((t  = strchr(myflagset, *s)))
-				tcp->th_flags |= myflags[t - myflagset];
-		if (tcp->th_flags)
-			cpp++;
-		if (tcp->th_flags == 0)
-			abort();
 		if (tcp->th_flags & TH_URG)
 			tcp->th_urp = htons(1);
+
+		if (*cpp && !strncasecmp(*cpp, "seq=", 4)) {
+			tcp->th_seq = htonl(atoi(*cpp + 4));
+			cpp++;
+		}
+
+		if (*cpp && !strncasecmp(*cpp, "ack=", 4)) {
+			tcp->th_ack = htonl(atoi(*cpp + 4));
+			cpp++;
+		}
 	} else if (*cpp && ip->ip_p == IPPROTO_ICMP) {
 		extern	char	*tx_icmptypes[];
 		char	**s, *t;

==== //depot/projects/ethng/src/contrib/ipfilter/lib/printnat.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/contrib/ipfilter/lib/printnat.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $	*/
+/*	$FreeBSD: src/contrib/ipfilter/lib/printnat.c,v 1.5 2007/10/18 21:52:12 darrenr Exp $	*/
 
 /*
  * Copyright (C) 2002-2005 by Darren Reed.
@@ -13,7 +13,7 @@
 
 
 #if !defined(lint)
-static const char rcsid[] = "@(#)$Id: printnat.c,v 1.22.2.13 2006/12/09 10:37:47 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: printnat.c,v 1.22.2.14 2007/09/06 16:40:11 darrenr Exp $";
 #endif
 
 /*
@@ -136,6 +136,8 @@
 		if (opts & OPT_DEBUG)
 			printf("\tpmax %u\n", np->in_pmax);
 	} else {
+		int protoprinted = 0;
+
 		if (!(np->in_flags & IPN_FILTER)) {
 			printf("%s/", inet_ntoa(np->in_in[0].in4));
 			bits = count4bits(np->in_inmsk);
@@ -172,6 +174,7 @@

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


More information about the p4-projects mailing list