PERFORCE change 117871 for review

Scott Long scottl at FreeBSD.org
Tue Apr 10 22:05:01 UTC 2007


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

Change 117871 by scottl at scottl-x64 on 2007/04/10 22:04:09

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/FREEBSD-upgrade#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/KNOWNBUGS#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/PGPKEYS#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/RELEASE_NOTES#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/README#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/cf/knecht.mc#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/cf/submit.cf#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/feature/access_db.m4#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/feature/badmx.m4#1 branch
.. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/feature/block_bad_helo.m4#1 branch
.. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/feature/dnsbl.m4#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/feature/enhdnsbl.m4#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/feature/require_rdns.m4#1 branch
.. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/m4/proto.m4#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/m4/version.m4#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/mailer/smtp.m4#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/contrib/cidrexpand#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/contrib/qtool.pl#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/doc/op/op.me#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/editmap/Makefile.m4#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/include/libmilter/mfapi.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/include/libmilter/mfdef.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/include/libmilter/milter.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/include/sm/conf.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/include/sm/errstring.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/include/sm/heap.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/include/sm/ldap.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/include/sm/misc.h#1 branch
.. //depot/projects/scottl-camlock/src/contrib/sendmail/include/sm/os/sm_os_qnx.h#1 branch
.. //depot/projects/scottl-camlock/src/contrib/sendmail/include/sm/sendmail.h#1 branch
.. //depot/projects/scottl-camlock/src/contrib/sendmail/include/sm/tailq.h#1 branch
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/Makefile.m4#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/README#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/comm.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/api.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/design.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/index.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/installation.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/other.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/overview.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/sample.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_addheader.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html#1 branch
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_chgfrom.html#1 branch
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_chgheader.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_getpriv.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_getsymval.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_insheader.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_main.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_progress.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_quarantine.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_register.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_replacebody.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_setconn.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_setdbg.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_setmlreply.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_setpriv.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_setreply.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_setsymlist.html#1 branch
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_settimeout.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_stop.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_version.html#1 branch
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_abort.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_body.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_close.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_connect.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_data.html#1 branch
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_envfrom.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_eoh.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_eom.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_header.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_helo.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_negotiate.html#1 branch
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/xxfi_unknown.html#1 branch
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/engine.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/example.c#1 branch
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/handler.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/libmilter.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/listener.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/main.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/monitor.c#1 branch
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/smfi.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/worker.c#1 branch
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/Makefile.m4#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/config.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/exc.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/exc.html#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/findfp.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/flags.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/ldap.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/local.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/memstat.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/snprintf.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/t-memstat.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/t-qic.c#1 branch
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/t-sem.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/util.c#1 branch
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/vfscanf.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsmdb/Makefile.m4#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/libsmutil/Makefile.m4#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/mail.local/Makefile.m4#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/mail.local/mail.local.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/mailstats/Makefile.m4#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/makemap/Makefile.m4#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/praliases/Makefile.m4#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/rmail/Makefile.m4#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/smrsh/Makefile.m4#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/Makefile.m4#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/README#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/TRACEFLAGS#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/TUNING#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/alias.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/arpadate.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/collect.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/conf.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/conf.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/control.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/daemon.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/daemon.h#1 branch
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/deliver.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/domain.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/envelope.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/err.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/headers.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/helpfile#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/macro.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/mailq.1#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/main.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/map.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/map.h#1 branch
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/mci.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/milter.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/mime.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/parseaddr.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/queue.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/ratectrl.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/readcf.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/recipient.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/sasl.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/savemail.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/sendmail.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/sm_resolve.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/srvrsmtp.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/stab.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/stats.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/timers.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/tls.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/udb.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/usersmtp.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/util.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/src/version.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/test/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/vacation/Makefile.m4#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/vacation/vacation.c#2 integrate
.. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#3 integrate
.. //depot/projects/scottl-camlock/src/etc/mtree/BSD.root.dist#3 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/FILESYSTEMS#2 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/NETWORKING#2 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/hostid#1 branch
.. //depot/projects/scottl-camlock/src/etc/rc.d/ipfilter#3 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/ipsec#3 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/kldxref#3 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/mountcritremote#3 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/netoptions#2 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/pf#3 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/pflog#3 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/pfsync#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/Symbol.map#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/sysctl.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/i386/Symbol.map#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdlib/strtol.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/ptrace.2#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libmilter/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libsm/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/rtld-elf/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/libexec/rtld-elf/Symbol.map#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/rtld-elf/Versions.def#2 integrate
.. //depot/projects/scottl-camlock/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.8#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/iftrunk.c#1 branch
.. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/trunk.4#1 branch
.. //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/hash.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/misc/committers-ports.dot#2 integrate
.. //depot/projects/scottl-camlock/src/share/misc/committers-src.dot#2 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#16 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#13 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_string.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/kmem.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/string.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#21 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#20 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ah_osdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/brgphy.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/miidevs#9 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#16 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/conf/GENERIC#12 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_mib.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_mqueue.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/libkern/index.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/libkern/rindex.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/Makefile#20 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/dpt/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/if_trunk/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/net/ieee8023ad_lacp.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/net/ieee8023ad_lacp.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/net/if.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_trunk.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/net/if_trunk.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/net/if_var.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec_osdep.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/conf/GENERIC#12 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/conf/GENERIC#14 integrate
.. //depot/projects/scottl-camlock/src/sys/rpc/types.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#14 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/conf/GENERIC#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/hash.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/kernel.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/libkern.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/priv.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sysctl.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_snapshot.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_softdep.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/phys_pager.c#6 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/netinet/ipsockopt/ipsockopt.c#2 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/net80211/wesside/wesside/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.c#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.h#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/net80211/wesside/wesside/wesside.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/gcore/elfcore.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/kdump/kdump.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/kdump/kdump_subr.h#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/kdump/mksubr#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/netstat/mcast.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/tar/write.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/touch/touch.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/touch/touch.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/truss/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/truss/amd64-fbsd.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/truss/extern.h#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/truss/i386-fbsd.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/truss/i386-linux.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/truss/ia64-fbsd.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/truss/main.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/truss/powerpc-fbsd.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/truss/setup.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/truss/sparc64-fbsd.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/truss/syscall.h#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/truss/syscalls.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/truss/truss.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/truss/truss.h#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/uuidgen/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ifmcstat/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ifmcstat/ifmcstat.8#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ifmcstat/ifmcstat.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sendmail/Makefile#2 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.77 2007/03/28 07:49:57 delphij Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.78 2007/04/09 19:16:48 pjd Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,8 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20070409: uuidgen moved to /bin/
+OLD_FILES+=usr/bin/uuidgen
 # 20070328: bzip2 1.0.4
 OLD_FILES+=usr/share/info/bzip2.info.gz
 # 20070303: libarchive 2.0

==== //depot/projects/scottl-camlock/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 (text+ko) ====

@@ -290,6 +290,7 @@
 #define	kmem_alloc(_s, _f)	umem_alloc(_s, _f)
 #define	kmem_zalloc(_s, _f)	umem_zalloc(_s, _f)
 #define	kmem_free(_b, _s)	umem_free(_b, _s)
+#define	kmem_size()		(physmem * PAGESIZE)
 #define	kmem_cache_create(_a, _b, _c, _d, _e, _f, _g, _h, _i) \
 	umem_cache_create(_a, _b, _c, _d, _e, _f, _g, _h, _i)
 #define	kmem_cache_destroy(_c)	umem_cache_destroy(_c)
@@ -489,12 +490,15 @@
 #define	SX_SYSINIT(name, lock, desc)
 
 #define	SYSCTL_DECL(...)
+#define	SYSCTL_NODE(...)
 #define	SYSCTL_INT(...)
-#define	SYSCTL_NODE(...)
+#define	SYSCTL_ULONG(...)
 #ifdef TUNABLE_INT
 #undef TUNABLE_INT
+#undef TUNABLE_ULONG
 #endif
 #define	TUNABLE_INT(...)
+#define	TUNABLE_ULONG(...)
 
 /* Errors */
 

==== //depot/projects/scottl-camlock/src/contrib/sendmail/FREEBSD-upgrade#2 (text+ko) ====

@@ -1,6 +1,6 @@
-$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.32 2006/08/17 05:14:33 gshapiro Exp $
+$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.33 2007/04/09 01:46:43 gshapiro Exp $
 
-sendmail 8.13.8
+sendmail 8.14.1
 	originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/
 
 For the import of sendmail, the following files were removed:
@@ -21,8 +21,8 @@
 
 Imported using:
 
-	cvs import -m 'Import sendmail 8.13.8' \
-		src/contrib/sendmail SENDMAIL v8_13_8
+	cvs import -m 'Import sendmail 8.14.1' \
+		src/contrib/sendmail SENDMAIL v8_14_1
 
 After importing, bump the version of src/etc/sendmail/freebsd*mc
 so mergemaster will merge /etc/mail/freebsd*cf:
@@ -97,4 +97,4 @@
 	usr.sbin/mailwrapper/Makefile
 
 gshapiro at FreeBSD.org
-16-August-2006
+08-April-2007

==== //depot/projects/scottl-camlock/src/contrib/sendmail/KNOWNBUGS#2 (text+ko) ====

@@ -29,10 +29,10 @@
 * Null bytes are not handled properly in headers.
 
   Sendmail should handle full binary data.  As it stands, it handles
-  all values in the body, but only 0x01-0x80 and 0xA0-0xFF in
-  the header.  Notably missing is 0x00, which would require a major
-  restructuring of the code -- for example, almost no C library support
-  could be used to handle strings.
+  all values in the body, but not 0x00 in the header.  Changing
+  this would require a major restructuring of the code -- for
+  example, almost no C library support could be used to handle
+  strings.
 
 * Header checks are not called if header value is too long or empty.
 
@@ -170,7 +170,7 @@
 
   When sendmail is doing 8->7 bit MIME conversions, and the message
   contains certain MIME body types that cannot be converted to 7-bit,
-  sendmail will strip the message to 7-bit.
+  sendmail will pass the message as 8-bit.
 
 * 7->8 bit MIME conversion
 
@@ -235,9 +235,9 @@
 
   Sendmail will deliver to a fail if the file is owned by the DefaultUser
   or has the set-user-ID bit set.  Unfortunately, some systems clear that bit
-  when a file is modified.  Sendmail compensates by resetting the file mode 
+  when a file is modified.  Sendmail compensates by resetting the file mode
   back to it's original settings.  Unfortunately, there's still a
-  permission failure race as sendmail checks the permissions before locking 
+  permission failure race as sendmail checks the permissions before locking
   the file.  This is unavoidable as sendmail must verify the file is safe
   to open before opening it.  A file can not be locked until it is open.
 
@@ -247,4 +247,4 @@
   be used if set instead of LOCAL_RELAY ($R).  This will be fixed in a
   future version.
 
-$Revision: 8.57 $, Last updated $Date: 2004/12/02 23:39:01 $
+$Revision: 8.59 $, Last updated $Date: 2007/02/21 23:13:58 $

==== //depot/projects/scottl-camlock/src/contrib/sendmail/PGPKEYS#2 (text+ko) ====

@@ -142,6 +142,82 @@
 -----END PGP PUBLIC KEY BLOCK-----
 
 Type Bits KeyID      Created    Expires    Algorithm       Use
+pub  1024 0x7093B841 2006-12-16 ---------- RSA             Sign & Encrypt
+f16    Fingerprint16 = D9 FD C5 6B EE 1E 7A A8  CE 27 D9 B9 55 8B 56 B6
+uid  Sendmail Signing Key/2007 <sendmail at Sendmail.ORG>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (OpenBSD)
+
+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
+as8y
+=w7F1
+-----END PGP PUBLIC KEY BLOCK-----
+
+Type Bits KeyID      Created    Expires    Algorithm       Use
 pub  1024 0xAF959625 2005-12-31 ---------- RSA             Sign & Encrypt
 f16    Fingerprint16 = E3 F4 97 BC 9F DF 3F 1D  9B 0D DF D5 77 9A C9 79
 uid  Sendmail Signing Key/2006 <sendmail at Sendmail.ORG>
@@ -1653,4 +1729,4 @@
 =nES8
 -----END PGP PUBLIC KEY BLOCK-----
 
-$Revision: 8.24 $, Last updated $Date: 2006/05/01 19:10:19 $
+$Revision: 8.25 $, Last updated $Date: 2007/01/02 22:38:08 $

==== //depot/projects/scottl-camlock/src/contrib/sendmail/RELEASE_NOTES#2 (text+ko) ====

@@ -1,11 +1,279 @@
 			SENDMAIL RELEASE NOTES
-      $Id: RELEASE_NOTES,v 8.1777.2.15 2006/08/07 17:22:09 ca Exp $
+      $Id: RELEASE_NOTES,v 8.1888 2007/04/03 23:28:40 ca Exp $
 
 
 This listing shows the version of the sendmail binary, the version
 of the sendmail configuration files, the date of release, and a
 summary of the changes in that release.
 
+8.14.1/8.14.1	2007/04/03
+	Even though a milter rejects a recipient the MTA will still keep
+		it in its list of recipients and deliver to it if the
+		transaction is accepted. This is a regression introduced
+		in 8.14.0 due to the change for SMFIP_RCPT_REJ.  Bug
+		found by Andy Fiddaman.
+	The new DaemonPortOptions which begin with a lower case character
+		could not be set in 8.14.0.
+	If a server shut down the connection in response to a STARTTLS
+		command, sendmail would log a misleading error message
+		due to an internal inconsistency.  Problem found by
+		Werner Wiethege.
+	Document how some sendmail.cf options change the behavior of mailq.
+		Noted by Paul Menchini of the North Carolina School of
+		Science and Mathematics.
+	CONFIG: Add confSOFT_BOUNCE m4 option for setting SoftBounce.
+	CONFIG: 8.14.0's RELEASE_NOTES failed to mention the addition
+		of the confMAX_NOOP_COMMANDS and confSHARED_MEMORY_KEY_FILE
+		m4 options for setting MaxNOOPCommands and
+		SharedMemoryKeyFile.
+	CONFIG: Add confMILTER_MACROS_EOH and confMILTER_MACROS_DATA m4
+		options for setting Milter.macros.eoh and Milter.macros.data.
+	CONTRIB: Use flock() and fcntl() in qtool.pl if necessary.
+		Patch from Daniel Carroll of Mesa State College.
+	LIBMILTER: Make sure an unknown command does not affect the
+		currently available macros.  Problem found by Andy Fiddaman.
+	LIBMILTER: The MTA did not offer SMFIF_SETSYMLIST during option
+		negotiation.  Problem reported by Bryan Costales.
+	LIBMILTER: Fix several minor errors in the documentation.
+		Patches from Bryan Costales.
+	PORTABILITY FIXES:
+		AIX 5.{1,2}: libsm/util.c failed to compile due to
+			redefinition of several macros, e.g., SIG_ERR.
+			Patch from Jim Pirzyk with assistance by Bob
+			Booth, University of Illinois at Urbana-Champaign.
+		Add support for QNX.6.  Patch from Sean Boudreau of QNX
+			Software Systems.
+	New Files:
+		devtools/M4/depend/QNX6.m4
+		devtools/OS/QNX.6.x
+		include/sm/os/sm_os_qnx.h
+
+	New Files added in 8.14.0, but not shown in the release notes entry:
+		libmilter/docs/smfi_chgfrom.html
+		libmilter/docs/smfi_version.html
+
+8.14.0/8.14.0	2007/01/31
+	Header field values are now 8 bit clean.  Notes:
+		- header field names are still restricted to 7 bit.
+		- RFC 2822 allows only 7 bit (US-ASCII) characters in
+		  headers.
+	Preserve spaces after the colon in a header.  Previously, any
+		number of spaces after the colon would be changed to
+		exactly one space.
+	In some cases of deeply nested aliases/forwarding, mail can
+		be silently lost.  Moreover, the MaxAliasRecursion
+		limit may be reached too early, e.g., the counter
+		may be off by a factor of 4 in case of a sequence of
+		.forward files that refer to others.  Patch from
+		Motonori Nakamura of Kyoto University.
+	Fix a regression in 8.13.8: if InputMailFilters is set then
+		"sendmail -bs" can trigger an assertion because the
+		hostname of the client is undefined.  It is now set
+		to "localhost" for the xxfi_connect() callback.
+	Avoid referencing a freed variable during cleanup when terminating.
+		Problem reported and diagnosed by Joe Maimon.
+	New option HeloName to set the name for the HELO/EHLO command.
+		Patch from Nik Clayton.
+	New option SoftBounce to issue temporary errors (4xy) instead of
+		permanent errors (5xy).  This can be useful for testing.
+	New suboptions for DaemonPortOptions to set them individually
+		per daemon socket:
+			DeliveryMode	DeliveryMode
+			refuseLA	RefuseLA
+			delayLA		DelayLA
+			queueLA		QueueLA
+			children	MaxDaemonChildren
+	New option -K for LDAP maps to replace %1 through %9 in the
+		lookup key with the LDAP escaped contents of the
+		arguments specified in the map lookup.  Loosely based
+		on patch from Wolfgang Hottgenroth.
+	Log the time after which a greet_pause delay triggered.  Patch
+		from Nik Clayton.
+	If a client is rejected via TCP wrapper or some other check
+		performed by validate_connection() (in conf.c) then do
+		not also invoke greet_pause.  Problem noted by Jim Pirzyk
+		of the University of Illinois at Urbana-Champaign.
+	If a client terminates the SMTP connection during a pause
+		introduced by greet_pause, then a misleading message
+		was logged previously.  Problem noted by Vernon Schryver
+		et.al., patch from Matej Vela.
+	New command "mstat" for control socket to provide "machine
+		readable" status.
+	New named config file rule check_eom which is called at the end
+		of a message, its parameter is the size of the message.
+	If the macro {addr_type} indicates that the current address
+		is a header address it also distinguishes between
+		recipient and sender addresses (as it is done for
+		envelope addresses).
+	When a macro is set in check_relay, then its value is accessible
+		by all transactions in the same SMTP session.
+	Increase size of key for ldap lookups to 1024 (MAXKEY).
+	New option MaxNOOPCommands to override default of 20 for the
+		number of "useless" commands before the SMTP server will
+		slow down responding.
+	New option SharedMemoryKeyFile: if shared memory support is
+		enabled, the MTA can be asked to select a shared memory
+		key itself by setting SharedMemoryKey to -1 and specifying
+		a file where to store the selected key.
+	Try to deal with open HTTP proxies that are used to send spam
+		by recognizing some commands from them. If the first command
+		from the client is GET, POST, CONNECT, or USER, then the
+		connection is terminated immediately.
+	New PrivacyOptions noactualrecipient to avoid putting
+		X-Actual-Recipient lines in DSNs revealing the actual
+		account that addresses map to.  Patch from Dan Harkless.
+	New options B, z, and Z for DNS maps:
+		-B: specify a domain that is always appended to queries.
+		-z: specify the delimiter at which to cut off the result of
+			a query if it is too long.
+		-Z: specify the maximum number of entries to be concatenated
+			to form the result of a lookup.
+	New target "check" in the Makefile of libsm: instead of running tests
+		implicitly while building libsm, they must be explicitly
+		started by using "make check".
+	Fixed some inconsistent checks for NULL pointers that have been
+		reported by the SATURN tool which has been developed by
+		Isil Dillig and Thomas Dillig of Stanford University.
+	Fix a potential race condition caused by a signal handler for
+		terminated child processes.  Problem noted by David F. Skoll.
+	When a milter deleted a recipient, that recipient could cause a
+		queue group selection. This has been disabled as it was not
+		intended.
+	New operator 'r' for the arith map to return a random number.
+		Patch from Motonori Nakamura of Kyoto University.
+	New compile time option MILTER_NO_NAGLE to turn off the Nagle
+		algorithm for communication with libmilter ("cork" on Linux),
+		which may improve the communication performance on some
+		operating systems.  Patch from John Gardiner Myers of
+		Proofpoint.
+	If sendmail received input that contained a CR without subsequent LF
+		(thus violating RFC 2821 (2.3.7)), it could previously
+		generate an additional blank line in the output as the last
+		line.
+	Restarting persistent queue runners by sending a HUP signal to
+		the "queue control process" (QCP) works now.
+	Increase the length of an input line to 12288 to deal with
+		really long lines during SMTP AUTH negotiations.
+		Problem noted by Werner Wiethege.
+	If ARPANET mode (-ba) was selected STARTTLS would fail (due to
+		a missing initialization call for that case).  Problem
+		noted by Neil Rickert of Northern Illinois University.
+	If sendmail is linked against a library that initializes Cyrus-SASL
+		before sendmail did it (such as libnss-ldap), then SMTP AUTH
+		could fail for the sendmail client.  A patch by Moritz Both
+		works around the API design flaw of Cyrus-SASLv2.
+	CONFIG: Make it possible to unset the StatusFile option by
+		undefining STATUS_FILE.  By not setting StatusFile,
+		the MTA will not attempt to open a statistics file on
+		each delivery.
+	CONFIG: New FEATURE(`require_rdns') to reject messages from SMTP
+		clients whose IP address does not have proper reverse DNS.
+		Contributed by Neil Rickert of Northern Illinois University
+		and John Beck of Sun Microsystems.
+	CONFIG: New FEATURE(`block_bad_helo') to reject messages from SMTP
+		clients which provide a HELO/EHLO argument which is either
+		unqualified, or is one of our own names (i.e., the server
+		name instead of the client name).  Contributed by Neil
+		Rickert of Northern Illinois University and John Beck of
+		Sun Microsystems.
+	CONFIG: New FEATURE(`badmx') to reject envelope sender addresses
+		(MAIL) whose domain part resolves to a "bad" MX record.
+		Based on contribution from William Dell Wisner.
+	CONFIG: New macros SMTP_MAILER_LL and RELAY_MAILER_LL to override
+		the maximum line length of the smtp mailers.
+	CONFIG: New option `relaytofulladdress' for FEATURE(`access_db')
+		to allow entries in the access map to be of the form
+			To:user at example.com	RELAY
+	CONFIG: New subsuboptions eoh and data to specify the list of
+		macros a milter should receive at those stages in the
+		SMTP dialogue.
+	CONFIG: New option confHELO_NAME for HeloName to set the name
+		for the HELO/EHLO command.
+	CONFIG: dnsbl and enhdnsbl can now also discard or quarantine
+		messages by using those values as second argument.
+		Patches from Nelson Fung.
+	CONTRIB: cidrexpand uses a hash symbol as comment character and
+		ignores everything after it unless it is in quotes or
+		preceeded by a backslash.
+	DEVTOOLS: New macro confMKDIR: if set to a program that creates
+		directories, then it used for "make install" to create
+		the required installation directories.
+	DEVTOOLS: New macro confCCLINK to specify the linker to use for
+		executables (defaults to confCC).
+	LIBMILTER: A new version of the milter API has been created that
+		has several changes which are listed below and documented
+		in the webpages reachable via libmilter/docs/index.html.
+	LIBMILTER: The meaning of the version macro SMFI_VERSION has been
+		changed.  It now refers only to the version of libmilter,
+		not to the protocol version (which is used only internally,
+		it is not user/milter-programmer visible).  Additionally,
+		a version function smfi_version() has been introduced such
+		that a milter program can check the libmilter version also
+		at runtime which is useful if a shared library is used.
+	LIBMILTER: A new callback xxfi_negotiate() can be used to
+		dynamically (i.e., at runtime) determine the available
+		protocol actions and features of the MTA and also to
+		specify which of these a milter wants to use.  This allows
+		for more flexibility than hardcoding these flags in the
+		xxfi_flags field of the smfiDesc structure.
+	LIBMILTER: A new callback xxfi_data() is available so milters
+		can act on the DATA command.
+	LIBMILTER: A new callback xxfi_unknown() is available so milters
+		can receive also unknown SMTP commands.
+	LIBMILTER: A new return code SMFIS_NOREPLY has been added which
+		can be used by the xxfi_header() callback provided the
+		milter requested the SMFIP_NOHREPL protocol action.
+	LIBMILTER: The new return code SMFIS_SKIP can be used in the
+		xxfi_body() callback to skip over further body chunks
+		and directly advance to the xxfi_eom() callback.  This
+		is useful if a milter can make a decision based on the
+		body chunks it already received without reading the entire
+		rest of the body and the milter wants to invoke functions
+		that are only available from the xxfi_eom() callback.
+	LIBMILTER: A new function smfi_addrcpt_par() can be used to add
+		new recipients including ESMTP parameters.
+	LIBMILTER: A new function smfi_chgfrom() can be used to change the
+		envelope sender including ESMTP parameters.
+	LIBMILTER: A milter can now request to be informed about rejected
+		recipients (RCPT) too.  This requires to set the protocol
+		flag SMFIP_RCPT_REJ during option negotiation.  Whether
+		a RCPT has been rejected can be checked by comparing the
+		value of the macro {rcpt_mailer} with "error".
+	LIBMILTER: A milter can now override the list of macros that it
+		wants to receive from the MTA for each protocol step
+		by invoking the function smfi_setsymlist() during option
+		negotiation.
+	LIBMILTER: A milter can receive header field values with all
+		leading spaces by requesting the SMFIP_HDR_LEADSPC
+		protocol action.  Also, if the flag is set then the MTA
+		does not add a leading space to headers that are added,
+		inserted, or replaced.
+	LIBMILTER: If a milter sets the reply code to "421" for the HELO
+		callback, the SMTP server will terminate the SMTP session
+		with that error to match the behavior of all other callbacks.
+	New Files:
+		cf/feature/badmx.m4
+		cf/feature/block_bad_helo.m4
+		cf/feature/require_rdns.m4
+		devtools/M4/UNIX/check.m4
+		include/sm/misc.h
+		include/sm/sendmail.h
+		include/sm/tailq.h
+		libmilter/docs/smfi_addrcpt_par.html
+		libmilter/docs/smfi_setsymlist.html
+		libmilter/docs/xxfi_data.html
+		libmilter/docs/xxfi_negotiate.html
+		libmilter/docs/xxfi_unknown.html
+		libmilter/example.c
+		libmilter/monitor.c
+		libmilter/worker.c
+		libsm/memstat.c
+		libsm/t-memstat.c
+		libsm/t-qic.c
+		libsm/util.c
+		sendmail/daemon.h
+		sendmail/map.h
+
 8.13.8/8.13.8	2006/08/09
 	Fix a regression in 8.13.7: if shared memory is activated, then
 		the server can erroneously report that there is
@@ -1317,7 +1585,7 @@
 	Properly count message size for mailstats during mail collection.
 		Problem noted by Werner Wiethege.
 	Log complete response from LMTP delivery agent on failure.  Based on
-		patch from by Motonori Nakamura of Kyoto University.
+		patch from Motonori Nakamura of Kyoto University.
 	Provide workaround for getopt() implementations that do not catch
 		missing arguments.
 	Fix the message size calculation if the message body is replaced by

==== //depot/projects/scottl-camlock/src/contrib/sendmail/cf/README#2 (text+ko) ====

@@ -397,6 +397,9 @@
 			that ARRIVE from an address that resolves to one of
 			the SMTP mailers and which are converted to MIME will
 			be labeled with this character set.
+SMTP_MAILER_LL		[990] The maximum line length for SMTP mailers
+			(except the relay mailer).
+RELAY_MAILER_LL		[2040] The maximum line length for the relay mailer.
 UUCP_MAILER_PATH	[/usr/bin/uux] The program used to send UUCP mail.
 UUCP_MAILER_FLAGS	[undefined] Flags added to UUCP mailer.  Default
 			flags are `DFMhuU' (and `m' for uucp-new mailer,
@@ -1031,12 +1034,6 @@
 
 		See the LDAP ROUTING section below for more information.
 
-nodns		If you aren't running DNS at your site (for example,
-		you are UUCP-only connected).  It's hard to consider
-		this a "feature", but hey, it had to go somewhere.
-		Actually, as of 8.7 this is a no-op -- remove "dns" from
-		the hosts service switch entry instead.
-
 nullclient	This is a special case -- it creates a configuration file
 		containing nothing but support for forwarding all mail to a
 		central hub via a local SMTP-based network.  The argument
@@ -1241,12 +1238,15 @@
 		versions when delay_checks was not in use.  See doc/op/op.*
 		about check_relay, {client_name}, and {client_ptr}.
 
-dnsbl		Turns on rejection of hosts found in an DNS based rejection
-		list.  The first is used as the domain in which blocked
-		hosts are listed.  A second argument can be used to change
-		the default error message.  Without that second argument,
-		the error message will be
+dnsbl		Turns on rejection, discarding, or quarantining of hosts
+		found in a DNS based list.  The first argument is used as
+		the domain in which blocked hosts are listed.  A second
+		argument can be used to change the default error message,
+		or select one of the operations `discard' and `quarantine'.
+		Without that second argument, the error message will be
+
 			Rejected: IP-ADDRESS listed at SERVER
+
 		where IP-ADDRESS and SERVER are replaced by the appropriate
 		information.  By default, temporary lookup failures are
 		ignored.  This behavior can be changed by specifying a
@@ -1485,6 +1485,81 @@
 			R$*		$: $&{daemon_flags}
 			R$* a $*	$# 0
 
+block_bad_helo	Reject messages from SMTP clients which provide a HELO/EHLO
+		argument which is either unqualified, or is one of our own
+		names (i.e., the server name instead of the client name).
+		This check is performed at RCPT stage and disabled for the
+		following cases:
+		- authenticated sessions,
+		- connections from IP addresses in class $={R}.
+		Currently access_db lookups can not be used to
+		(selectively) disable this test, moreover,
+		FEATURE(`delay_checks')
+		is required.
+
+require_rdns	Reject mail from connecting SMTP clients without proper
+		rDNS (reverse DNS), functional gethostbyaddr() resolution.
+		Note: this feature will cause false positives, i.e., there
+		are legitimate MTAs that do not have proper DNS entries.
+		Rejecting mails from those MTAs is a local policy decision.
+
+		The basic policy is to reject message with a 5xx error if
+		the IP address fails to resolve.  However, if this is a
+		temporary failure, a 4xx temporary failure is returned.
+		If the look-up succeeds, but returns an apparently forged
+		value, this is treated as a temporary failure with a 4xx
+		error code.
+
+		EXCEPTIONS:
+
+		Exceptions based on access entries are discussed below.
+		Any IP address matched using $=R (the "relay-domains" file)
+		is excepted from the rules.  Since we have explicitly
+		allowed relaying for this host, based on IP address, we
+		ignore the rDNS failure.
+
+		The philosophical assumption here is that most users do
+		not control their rDNS.  They should be able to send mail
+		through their ISP, whether or not they have valid rDNS.
+		The class $=R, roughly speaking, contains those IP addresses
+		and address ranges for which we are the ISP, or are acting
+		as if the ISP.
+
+		If `delay_checks' is in effect (recommended), then any
+		sender who has authenticated is also excepted from the
+		restrictions.  This happens because the rules produced by
+		this FEATURE() will not be applied to authenticated senders
+		(assuming `delay_checks').
+
+		ACCESS MAP ENTRIES:
+
+		Entries such as
+			Connect:1.2.3.4		OK
+			Connect:1.2		RELAY
+		will whitelist IP address 1.2.3.4, so that the rDNS
+		blocking does apply to that IP address
+
+		Entries such as
+			Connect:1.2.3.4		REJECT
+		will have the effect of forcing a temporary failure for
+		that address to be treated as a permanent failure.
+
+badmx		Reject envelope sender addresses (MAIL) whose domain part
+		resolves to a "bad" MX record.  By default these are
+		MX records which resolve to A records that match the
+		regular expression:
+
+		^(127\.|10\.|0\.0\.0\.0)
+
+		This default regular expression can be overridden by
+		specifying an argument, e.g.,
+
+		FEATURE(`badmx', `^127\.0\.0\.1')
+
+		Note: this feature requires that the sendmail binary
+		has been compiled with the options MAP_REGEX and
+		DNSMAP.
+
 +-------+
 | HACKS |
 +-------+
@@ -2426,10 +2501,15 @@
 	FEATURE(`access_db', `hash -T<TMPF> /etc/mail/access_map')
 
 Notice: If a second argument is specified it must contain the option
-`-T<TMPF>' as shown above.  The optional third and fourth parameters
-may be `skip' or `lookupdotdomain'.  The former enables SKIP as
-value part (see below), the latter is another way to enable the
-feature of the same name (see above).
+`-T<TMPF>' as shown above.  The optional parameters may be
+
+	`skip'			enables SKIP as value part (see below).
+	`lookupdotdomain'	another way to enable the feature of the
+				same name (see above).
+	`relaytofulladdress'	enable entries of the form
+				To:user at example.com	RELAY
+				to allow relaying to just a specific
+				e-mail address instead of an entire domain.
 
 Remember, since /etc/mail/access is a database, after creating the text
 file as described below, you must use makemap to create the database
@@ -2497,7 +2577,8 @@
 			name is unresolvable.  "Accept" does not mean
 			"relay", but at most acceptance for local
 			recipients.  That is, OK allows less than RELAY.
-	RELAY		Accept mail addressed to the indicated domain or
+	RELAY		Accept mail addressed to the indicated domain
+			(or address if `relaytofulladdress' is set) or
 			received from the indicated domain for relaying
 			through your SMTP server.  RELAY also serves as
 			an implicit OK for the other checks.
@@ -2628,7 +2709,7 @@
 	FEATURE(`dnsbl', `dnsbl.example.com')
 
 This will cause sendmail to reject mail from any site listed in the
-DNS based blacklist.  You must select an DNSB based blacklist domain
+DNS based blacklist.  You must select a DNS based blacklist domain
 to check by specifying an argument to the FEATURE.  The default
 error message is
 
@@ -2636,10 +2717,18 @@
 
 where IP-ADDRESS and SERVER are replaced by the appropriate
 information.  A second argument can be used to specify a different
-text.  By default, temporary lookup failures are ignored and hence
-cause the connection not to be rejected by the DNS based rejection
-list.  This behavior can be changed by specifying a third argument,
-which must be either `t' or a full error message.  For example:
+text or action.  For example,
+
+	FEATURE(`dnsbl', `dnsbl.example.com', `quarantine')
+
+would quarantine the message if the client IP address is listed
+at `dnsbl.example.com'.
+
+By default, temporary lookup failures are ignored
+and hence cause the connection not to be rejected by the DNS based
+rejection list.  This behavior can be changed by specifying a third
+argument, which must be either `t' or a full error message.  For
+example:
 
 	FEATURE(`dnsbl', `dnsbl.example.com', `',
 	`"451 Temporary lookup failure for " $&{client_addr} " in dnsbl.example.com"')
@@ -4033,6 +4122,11 @@
 					"double bounce" error message to this
 					address.  If it expands to an empty
 					string, double bounces are dropped.
+confSOFT_BOUNCE		SoftBounce	[False] If set, issue temporary errors
+					(4xy) instead of permanent errors
+					(5xy).  This can be useful during
+					testing of a new configuration to
+					avoid erroneous bouncing of mails.
 confDEAD_LETTER_DROP	DeadLetterDrop	[undefined] Filename to save bounce
 					messages which could not be returned
 					to the user or sent to postmaster.
@@ -4197,6 +4291,11 @@

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


More information about the p4-projects mailing list