[Midnightbsd-cvs] src [9102] stable/0.8: MidnightBSD 0.8.2
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Oct 1 13:46:49 EDT 2016
Revision: 9102
http://svnweb.midnightbsd.org/src/?rev=9102
Author: laffer1
Date: 2016-10-01 13:46:48 -0400 (Sat, 01 Oct 2016)
Log Message:
-----------
MidnightBSD 0.8.2
Modified Paths:
--------------
stable/0.8/UPDATING
stable/0.8/contrib/sendmail/CACerts
stable/0.8/contrib/sendmail/FAQ
stable/0.8/contrib/sendmail/INSTALL
stable/0.8/contrib/sendmail/KNOWNBUGS
stable/0.8/contrib/sendmail/LICENSE
stable/0.8/contrib/sendmail/Makefile
stable/0.8/contrib/sendmail/PGPKEYS
stable/0.8/contrib/sendmail/README
stable/0.8/contrib/sendmail/RELEASE_NOTES
stable/0.8/contrib/sendmail/cf/README
stable/0.8/contrib/sendmail/cf/cf/Makefile
stable/0.8/contrib/sendmail/cf/cf/README
stable/0.8/contrib/sendmail/cf/cf/chez.cs.mc
stable/0.8/contrib/sendmail/cf/cf/clientproto.mc
stable/0.8/contrib/sendmail/cf/cf/cs-hpux10.mc
stable/0.8/contrib/sendmail/cf/cf/cs-hpux9.mc
stable/0.8/contrib/sendmail/cf/cf/cs-osf1.mc
stable/0.8/contrib/sendmail/cf/cf/cs-solaris2.mc
stable/0.8/contrib/sendmail/cf/cf/cs-sunos4.1.mc
stable/0.8/contrib/sendmail/cf/cf/cs-ultrix4.mc
stable/0.8/contrib/sendmail/cf/cf/cyrusproto.mc
stable/0.8/contrib/sendmail/cf/cf/generic-bsd4.4.mc
stable/0.8/contrib/sendmail/cf/cf/generic-hpux10.mc
stable/0.8/contrib/sendmail/cf/cf/generic-hpux9.mc
stable/0.8/contrib/sendmail/cf/cf/generic-linux.mc
stable/0.8/contrib/sendmail/cf/cf/generic-mpeix.mc
stable/0.8/contrib/sendmail/cf/cf/generic-nextstep3.3.mc
stable/0.8/contrib/sendmail/cf/cf/generic-osf1.mc
stable/0.8/contrib/sendmail/cf/cf/generic-solaris.mc
stable/0.8/contrib/sendmail/cf/cf/generic-sunos4.1.mc
stable/0.8/contrib/sendmail/cf/cf/generic-ultrix4.mc
stable/0.8/contrib/sendmail/cf/cf/huginn.cs.mc
stable/0.8/contrib/sendmail/cf/cf/knecht.mc
stable/0.8/contrib/sendmail/cf/cf/mail.cs.mc
stable/0.8/contrib/sendmail/cf/cf/mail.eecs.mc
stable/0.8/contrib/sendmail/cf/cf/mailspool.cs.mc
stable/0.8/contrib/sendmail/cf/cf/python.cs.mc
stable/0.8/contrib/sendmail/cf/cf/s2k-osf1.mc
stable/0.8/contrib/sendmail/cf/cf/s2k-ultrix4.mc
stable/0.8/contrib/sendmail/cf/cf/submit.cf
stable/0.8/contrib/sendmail/cf/cf/submit.mc
stable/0.8/contrib/sendmail/cf/cf/tcpproto.mc
stable/0.8/contrib/sendmail/cf/cf/ucbarpa.mc
stable/0.8/contrib/sendmail/cf/cf/ucbvax.mc
stable/0.8/contrib/sendmail/cf/cf/uucpproto.mc
stable/0.8/contrib/sendmail/cf/cf/vangogh.cs.mc
stable/0.8/contrib/sendmail/cf/domain/Berkeley.EDU.m4
stable/0.8/contrib/sendmail/cf/domain/CS.Berkeley.EDU.m4
stable/0.8/contrib/sendmail/cf/domain/EECS.Berkeley.EDU.m4
stable/0.8/contrib/sendmail/cf/domain/S2K.Berkeley.EDU.m4
stable/0.8/contrib/sendmail/cf/domain/berkeley-only.m4
stable/0.8/contrib/sendmail/cf/domain/generic.m4
stable/0.8/contrib/sendmail/cf/feature/accept_unqualified_senders.m4
stable/0.8/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4
stable/0.8/contrib/sendmail/cf/feature/access_db.m4
stable/0.8/contrib/sendmail/cf/feature/allmasquerade.m4
stable/0.8/contrib/sendmail/cf/feature/always_add_domain.m4
stable/0.8/contrib/sendmail/cf/feature/authinfo.m4
stable/0.8/contrib/sendmail/cf/feature/badmx.m4
stable/0.8/contrib/sendmail/cf/feature/bestmx_is_local.m4
stable/0.8/contrib/sendmail/cf/feature/bitdomain.m4
stable/0.8/contrib/sendmail/cf/feature/blacklist_recipients.m4
stable/0.8/contrib/sendmail/cf/feature/block_bad_helo.m4
stable/0.8/contrib/sendmail/cf/feature/compat_check.m4
stable/0.8/contrib/sendmail/cf/feature/conncontrol.m4
stable/0.8/contrib/sendmail/cf/feature/delay_checks.m4
stable/0.8/contrib/sendmail/cf/feature/dnsbl.m4
stable/0.8/contrib/sendmail/cf/feature/domaintable.m4
stable/0.8/contrib/sendmail/cf/feature/enhdnsbl.m4
stable/0.8/contrib/sendmail/cf/feature/generics_entire_domain.m4
stable/0.8/contrib/sendmail/cf/feature/genericstable.m4
stable/0.8/contrib/sendmail/cf/feature/greet_pause.m4
stable/0.8/contrib/sendmail/cf/feature/ldap_routing.m4
stable/0.8/contrib/sendmail/cf/feature/limited_masquerade.m4
stable/0.8/contrib/sendmail/cf/feature/local_lmtp.m4
stable/0.8/contrib/sendmail/cf/feature/local_no_masquerade.m4
stable/0.8/contrib/sendmail/cf/feature/local_procmail.m4
stable/0.8/contrib/sendmail/cf/feature/lookupdotdomain.m4
stable/0.8/contrib/sendmail/cf/feature/loose_relay_check.m4
stable/0.8/contrib/sendmail/cf/feature/mailertable.m4
stable/0.8/contrib/sendmail/cf/feature/masquerade_entire_domain.m4
stable/0.8/contrib/sendmail/cf/feature/masquerade_envelope.m4
stable/0.8/contrib/sendmail/cf/feature/msp.m4
stable/0.8/contrib/sendmail/cf/feature/mtamark.m4
stable/0.8/contrib/sendmail/cf/feature/no_default_msa.m4
stable/0.8/contrib/sendmail/cf/feature/nocanonify.m4
stable/0.8/contrib/sendmail/cf/feature/notsticky.m4
stable/0.8/contrib/sendmail/cf/feature/nouucp.m4
stable/0.8/contrib/sendmail/cf/feature/nullclient.m4
stable/0.8/contrib/sendmail/cf/feature/preserve_local_plus_detail.m4
stable/0.8/contrib/sendmail/cf/feature/preserve_luser_host.m4
stable/0.8/contrib/sendmail/cf/feature/promiscuous_relay.m4
stable/0.8/contrib/sendmail/cf/feature/queuegroup.m4
stable/0.8/contrib/sendmail/cf/feature/ratecontrol.m4
stable/0.8/contrib/sendmail/cf/feature/redirect.m4
stable/0.8/contrib/sendmail/cf/feature/relay_based_on_MX.m4
stable/0.8/contrib/sendmail/cf/feature/relay_entire_domain.m4
stable/0.8/contrib/sendmail/cf/feature/relay_hosts_only.m4
stable/0.8/contrib/sendmail/cf/feature/relay_local_from.m4
stable/0.8/contrib/sendmail/cf/feature/relay_mail_from.m4
stable/0.8/contrib/sendmail/cf/feature/require_rdns.m4
stable/0.8/contrib/sendmail/cf/feature/smrsh.m4
stable/0.8/contrib/sendmail/cf/feature/stickyhost.m4
stable/0.8/contrib/sendmail/cf/feature/use_client_ptr.m4
stable/0.8/contrib/sendmail/cf/feature/use_ct_file.m4
stable/0.8/contrib/sendmail/cf/feature/use_cw_file.m4
stable/0.8/contrib/sendmail/cf/feature/uucpdomain.m4
stable/0.8/contrib/sendmail/cf/feature/virtuser_entire_domain.m4
stable/0.8/contrib/sendmail/cf/feature/virtusertable.m4
stable/0.8/contrib/sendmail/cf/hack/cssubdomain.m4
stable/0.8/contrib/sendmail/cf/m4/cf.m4
stable/0.8/contrib/sendmail/cf/m4/cfhead.m4
stable/0.8/contrib/sendmail/cf/m4/proto.m4
stable/0.8/contrib/sendmail/cf/m4/version.m4
stable/0.8/contrib/sendmail/cf/mailer/cyrus.m4
stable/0.8/contrib/sendmail/cf/mailer/cyrusv2.m4
stable/0.8/contrib/sendmail/cf/mailer/fax.m4
stable/0.8/contrib/sendmail/cf/mailer/local.m4
stable/0.8/contrib/sendmail/cf/mailer/mail11.m4
stable/0.8/contrib/sendmail/cf/mailer/phquery.m4
stable/0.8/contrib/sendmail/cf/mailer/pop.m4
stable/0.8/contrib/sendmail/cf/mailer/procmail.m4
stable/0.8/contrib/sendmail/cf/mailer/qpage.m4
stable/0.8/contrib/sendmail/cf/mailer/smtp.m4
stable/0.8/contrib/sendmail/cf/mailer/usenet.m4
stable/0.8/contrib/sendmail/cf/mailer/uucp.m4
stable/0.8/contrib/sendmail/cf/ostype/a-ux.m4
stable/0.8/contrib/sendmail/cf/ostype/aix3.m4
stable/0.8/contrib/sendmail/cf/ostype/aix4.m4
stable/0.8/contrib/sendmail/cf/ostype/aix5.m4
stable/0.8/contrib/sendmail/cf/ostype/altos.m4
stable/0.8/contrib/sendmail/cf/ostype/amdahl-uts.m4
stable/0.8/contrib/sendmail/cf/ostype/bsd4.3.m4
stable/0.8/contrib/sendmail/cf/ostype/bsd4.4.m4
stable/0.8/contrib/sendmail/cf/ostype/bsdi.m4
stable/0.8/contrib/sendmail/cf/ostype/bsdi1.0.m4
stable/0.8/contrib/sendmail/cf/ostype/bsdi2.0.m4
stable/0.8/contrib/sendmail/cf/ostype/darwin.m4
stable/0.8/contrib/sendmail/cf/ostype/dgux.m4
stable/0.8/contrib/sendmail/cf/ostype/domainos.m4
stable/0.8/contrib/sendmail/cf/ostype/dragonfly.m4
stable/0.8/contrib/sendmail/cf/ostype/dynix3.2.m4
stable/0.8/contrib/sendmail/cf/ostype/freebsd4.m4
stable/0.8/contrib/sendmail/cf/ostype/freebsd5.m4
stable/0.8/contrib/sendmail/cf/ostype/freebsd6.m4
stable/0.8/contrib/sendmail/cf/ostype/gnu.m4
stable/0.8/contrib/sendmail/cf/ostype/hpux10.m4
stable/0.8/contrib/sendmail/cf/ostype/hpux11.m4
stable/0.8/contrib/sendmail/cf/ostype/hpux9.m4
stable/0.8/contrib/sendmail/cf/ostype/irix4.m4
stable/0.8/contrib/sendmail/cf/ostype/irix5.m4
stable/0.8/contrib/sendmail/cf/ostype/irix6.m4
stable/0.8/contrib/sendmail/cf/ostype/isc4.1.m4
stable/0.8/contrib/sendmail/cf/ostype/linux.m4
stable/0.8/contrib/sendmail/cf/ostype/maxion.m4
stable/0.8/contrib/sendmail/cf/ostype/mklinux.m4
stable/0.8/contrib/sendmail/cf/ostype/mpeix.m4
stable/0.8/contrib/sendmail/cf/ostype/nextstep.m4
stable/0.8/contrib/sendmail/cf/ostype/openbsd.m4
stable/0.8/contrib/sendmail/cf/ostype/osf1.m4
stable/0.8/contrib/sendmail/cf/ostype/powerux.m4
stable/0.8/contrib/sendmail/cf/ostype/ptx2.m4
stable/0.8/contrib/sendmail/cf/ostype/qnx.m4
stable/0.8/contrib/sendmail/cf/ostype/riscos4.5.m4
stable/0.8/contrib/sendmail/cf/ostype/sco-uw-2.1.m4
stable/0.8/contrib/sendmail/cf/ostype/sco3.2.m4
stable/0.8/contrib/sendmail/cf/ostype/sinix.m4
stable/0.8/contrib/sendmail/cf/ostype/solaris11.m4
stable/0.8/contrib/sendmail/cf/ostype/solaris2.m4
stable/0.8/contrib/sendmail/cf/ostype/solaris2.ml.m4
stable/0.8/contrib/sendmail/cf/ostype/solaris2.pre5.m4
stable/0.8/contrib/sendmail/cf/ostype/solaris8.m4
stable/0.8/contrib/sendmail/cf/ostype/sunos3.5.m4
stable/0.8/contrib/sendmail/cf/ostype/sunos4.1.m4
stable/0.8/contrib/sendmail/cf/ostype/svr4.m4
stable/0.8/contrib/sendmail/cf/ostype/ultrix4.m4
stable/0.8/contrib/sendmail/cf/ostype/unicos.m4
stable/0.8/contrib/sendmail/cf/ostype/unicosmk.m4
stable/0.8/contrib/sendmail/cf/ostype/unicosmp.m4
stable/0.8/contrib/sendmail/cf/ostype/unixware7.m4
stable/0.8/contrib/sendmail/cf/ostype/unknown.m4
stable/0.8/contrib/sendmail/cf/ostype/uxpds.m4
stable/0.8/contrib/sendmail/cf/sendmail.schema
stable/0.8/contrib/sendmail/cf/sh/makeinfo.sh
stable/0.8/contrib/sendmail/contrib/README
stable/0.8/contrib/sendmail/contrib/bsdi.mc
stable/0.8/contrib/sendmail/contrib/buildvirtuser
stable/0.8/contrib/sendmail/contrib/cidrexpand
stable/0.8/contrib/sendmail/contrib/dnsblaccess.m4
stable/0.8/contrib/sendmail/contrib/link_hash.sh
stable/0.8/contrib/sendmail/contrib/qtool.8
stable/0.8/contrib/sendmail/contrib/qtool.pl
stable/0.8/contrib/sendmail/contrib/smcontrol.pl
stable/0.8/contrib/sendmail/contrib/socketmapClient.pl
stable/0.8/contrib/sendmail/contrib/socketmapServer.pl
stable/0.8/contrib/sendmail/doc/op/Makefile
stable/0.8/contrib/sendmail/doc/op/README
stable/0.8/contrib/sendmail/doc/op/op.me
stable/0.8/contrib/sendmail/editmap/Makefile
stable/0.8/contrib/sendmail/editmap/Makefile.m4
stable/0.8/contrib/sendmail/editmap/editmap.8
stable/0.8/contrib/sendmail/editmap/editmap.c
stable/0.8/contrib/sendmail/include/libmilter/mfapi.h
stable/0.8/contrib/sendmail/include/libmilter/mfdef.h
stable/0.8/contrib/sendmail/include/libmilter/milter.h
stable/0.8/contrib/sendmail/include/libsmdb/smdb.h
stable/0.8/contrib/sendmail/include/sendmail/mailstats.h
stable/0.8/contrib/sendmail/include/sendmail/pathnames.h
stable/0.8/contrib/sendmail/include/sendmail/sendmail.h
stable/0.8/contrib/sendmail/include/sm/assert.h
stable/0.8/contrib/sendmail/include/sm/bdb.h
stable/0.8/contrib/sendmail/include/sm/bitops.h
stable/0.8/contrib/sendmail/include/sm/cdefs.h
stable/0.8/contrib/sendmail/include/sm/cf.h
stable/0.8/contrib/sendmail/include/sm/clock.h
stable/0.8/contrib/sendmail/include/sm/conf.h
stable/0.8/contrib/sendmail/include/sm/config.h
stable/0.8/contrib/sendmail/include/sm/debug.h
stable/0.8/contrib/sendmail/include/sm/errstring.h
stable/0.8/contrib/sendmail/include/sm/exc.h
stable/0.8/contrib/sendmail/include/sm/fdset.h
stable/0.8/contrib/sendmail/include/sm/gen.h
stable/0.8/contrib/sendmail/include/sm/heap.h
stable/0.8/contrib/sendmail/include/sm/io.h
stable/0.8/contrib/sendmail/include/sm/ldap.h
stable/0.8/contrib/sendmail/include/sm/limits.h
stable/0.8/contrib/sendmail/include/sm/mbdb.h
stable/0.8/contrib/sendmail/include/sm/misc.h
stable/0.8/contrib/sendmail/include/sm/os/sm_os_aix.h
stable/0.8/contrib/sendmail/include/sm/os/sm_os_dragonfly.h
stable/0.8/contrib/sendmail/include/sm/os/sm_os_freebsd.h
stable/0.8/contrib/sendmail/include/sm/os/sm_os_hp.h
stable/0.8/contrib/sendmail/include/sm/os/sm_os_irix.h
stable/0.8/contrib/sendmail/include/sm/os/sm_os_linux.h
stable/0.8/contrib/sendmail/include/sm/os/sm_os_mpeix.h
stable/0.8/contrib/sendmail/include/sm/os/sm_os_next.h
stable/0.8/contrib/sendmail/include/sm/os/sm_os_openbsd.h
stable/0.8/contrib/sendmail/include/sm/os/sm_os_openunix.h
stable/0.8/contrib/sendmail/include/sm/os/sm_os_osf1.h
stable/0.8/contrib/sendmail/include/sm/os/sm_os_qnx.h
stable/0.8/contrib/sendmail/include/sm/os/sm_os_sunos.h
stable/0.8/contrib/sendmail/include/sm/os/sm_os_ultrix.h
stable/0.8/contrib/sendmail/include/sm/os/sm_os_unicos.h
stable/0.8/contrib/sendmail/include/sm/os/sm_os_unicosmk.h
stable/0.8/contrib/sendmail/include/sm/os/sm_os_unicosmp.h
stable/0.8/contrib/sendmail/include/sm/os/sm_os_unixware.h
stable/0.8/contrib/sendmail/include/sm/path.h
stable/0.8/contrib/sendmail/include/sm/rpool.h
stable/0.8/contrib/sendmail/include/sm/sem.h
stable/0.8/contrib/sendmail/include/sm/sendmail.h
stable/0.8/contrib/sendmail/include/sm/setjmp.h
stable/0.8/contrib/sendmail/include/sm/shm.h
stable/0.8/contrib/sendmail/include/sm/signal.h
stable/0.8/contrib/sendmail/include/sm/string.h
stable/0.8/contrib/sendmail/include/sm/sysexits.h
stable/0.8/contrib/sendmail/include/sm/tailq.h
stable/0.8/contrib/sendmail/include/sm/test.h
stable/0.8/contrib/sendmail/include/sm/time.h
stable/0.8/contrib/sendmail/include/sm/types.h
stable/0.8/contrib/sendmail/include/sm/varargs.h
stable/0.8/contrib/sendmail/include/sm/xtrap.h
stable/0.8/contrib/sendmail/libmilter/Makefile
stable/0.8/contrib/sendmail/libmilter/Makefile.m4
stable/0.8/contrib/sendmail/libmilter/README
stable/0.8/contrib/sendmail/libmilter/comm.c
stable/0.8/contrib/sendmail/libmilter/docs/api.html
stable/0.8/contrib/sendmail/libmilter/docs/design.html
stable/0.8/contrib/sendmail/libmilter/docs/index.html
stable/0.8/contrib/sendmail/libmilter/docs/installation.html
stable/0.8/contrib/sendmail/libmilter/docs/other.html
stable/0.8/contrib/sendmail/libmilter/docs/overview.html
stable/0.8/contrib/sendmail/libmilter/docs/sample.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_addheader.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_addrcpt.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_chgfrom.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_chgheader.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_delrcpt.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_getpriv.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_getsymval.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_insheader.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_main.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_opensocket.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_progress.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_quarantine.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_register.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_replacebody.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_setbacklog.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_setconn.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_setdbg.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_setmlreply.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_setpriv.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_setreply.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_setsymlist.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_settimeout.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_stop.html
stable/0.8/contrib/sendmail/libmilter/docs/smfi_version.html
stable/0.8/contrib/sendmail/libmilter/docs/xxfi_abort.html
stable/0.8/contrib/sendmail/libmilter/docs/xxfi_body.html
stable/0.8/contrib/sendmail/libmilter/docs/xxfi_close.html
stable/0.8/contrib/sendmail/libmilter/docs/xxfi_connect.html
stable/0.8/contrib/sendmail/libmilter/docs/xxfi_data.html
stable/0.8/contrib/sendmail/libmilter/docs/xxfi_envfrom.html
stable/0.8/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html
stable/0.8/contrib/sendmail/libmilter/docs/xxfi_eoh.html
stable/0.8/contrib/sendmail/libmilter/docs/xxfi_eom.html
stable/0.8/contrib/sendmail/libmilter/docs/xxfi_header.html
stable/0.8/contrib/sendmail/libmilter/docs/xxfi_helo.html
stable/0.8/contrib/sendmail/libmilter/docs/xxfi_negotiate.html
stable/0.8/contrib/sendmail/libmilter/docs/xxfi_unknown.html
stable/0.8/contrib/sendmail/libmilter/engine.c
stable/0.8/contrib/sendmail/libmilter/example.c
stable/0.8/contrib/sendmail/libmilter/handler.c
stable/0.8/contrib/sendmail/libmilter/libmilter.h
stable/0.8/contrib/sendmail/libmilter/listener.c
stable/0.8/contrib/sendmail/libmilter/main.c
stable/0.8/contrib/sendmail/libmilter/monitor.c
stable/0.8/contrib/sendmail/libmilter/signal.c
stable/0.8/contrib/sendmail/libmilter/sm_gethost.c
stable/0.8/contrib/sendmail/libmilter/smfi.c
stable/0.8/contrib/sendmail/libmilter/worker.c
stable/0.8/contrib/sendmail/libsm/Makefile
stable/0.8/contrib/sendmail/libsm/Makefile.m4
stable/0.8/contrib/sendmail/libsm/README
stable/0.8/contrib/sendmail/libsm/assert.c
stable/0.8/contrib/sendmail/libsm/assert.html
stable/0.8/contrib/sendmail/libsm/b-strcmp.c
stable/0.8/contrib/sendmail/libsm/b-strl.c
stable/0.8/contrib/sendmail/libsm/cdefs.html
stable/0.8/contrib/sendmail/libsm/cf.c
stable/0.8/contrib/sendmail/libsm/clock.c
stable/0.8/contrib/sendmail/libsm/clrerr.c
stable/0.8/contrib/sendmail/libsm/config.c
stable/0.8/contrib/sendmail/libsm/debug.c
stable/0.8/contrib/sendmail/libsm/debug.html
stable/0.8/contrib/sendmail/libsm/errstring.c
stable/0.8/contrib/sendmail/libsm/exc.c
stable/0.8/contrib/sendmail/libsm/exc.html
stable/0.8/contrib/sendmail/libsm/fclose.c
stable/0.8/contrib/sendmail/libsm/feof.c
stable/0.8/contrib/sendmail/libsm/ferror.c
stable/0.8/contrib/sendmail/libsm/fflush.c
stable/0.8/contrib/sendmail/libsm/fget.c
stable/0.8/contrib/sendmail/libsm/findfp.c
stable/0.8/contrib/sendmail/libsm/flags.c
stable/0.8/contrib/sendmail/libsm/fopen.c
stable/0.8/contrib/sendmail/libsm/fpos.c
stable/0.8/contrib/sendmail/libsm/fprintf.c
stable/0.8/contrib/sendmail/libsm/fpurge.c
stable/0.8/contrib/sendmail/libsm/fput.c
stable/0.8/contrib/sendmail/libsm/fread.c
stable/0.8/contrib/sendmail/libsm/fscanf.c
stable/0.8/contrib/sendmail/libsm/fseek.c
stable/0.8/contrib/sendmail/libsm/fvwrite.c
stable/0.8/contrib/sendmail/libsm/fvwrite.h
stable/0.8/contrib/sendmail/libsm/fwalk.c
stable/0.8/contrib/sendmail/libsm/fwrite.c
stable/0.8/contrib/sendmail/libsm/gen.html
stable/0.8/contrib/sendmail/libsm/get.c
stable/0.8/contrib/sendmail/libsm/glue.h
stable/0.8/contrib/sendmail/libsm/heap.c
stable/0.8/contrib/sendmail/libsm/heap.html
stable/0.8/contrib/sendmail/libsm/index.html
stable/0.8/contrib/sendmail/libsm/io.html
stable/0.8/contrib/sendmail/libsm/ldap.c
stable/0.8/contrib/sendmail/libsm/local.h
stable/0.8/contrib/sendmail/libsm/makebuf.c
stable/0.8/contrib/sendmail/libsm/match.c
stable/0.8/contrib/sendmail/libsm/mbdb.c
stable/0.8/contrib/sendmail/libsm/memstat.c
stable/0.8/contrib/sendmail/libsm/mpeix.c
stable/0.8/contrib/sendmail/libsm/niprop.c
stable/0.8/contrib/sendmail/libsm/put.c
stable/0.8/contrib/sendmail/libsm/refill.c
stable/0.8/contrib/sendmail/libsm/rewind.c
stable/0.8/contrib/sendmail/libsm/rpool.c
stable/0.8/contrib/sendmail/libsm/rpool.html
stable/0.8/contrib/sendmail/libsm/sem.c
stable/0.8/contrib/sendmail/libsm/setvbuf.c
stable/0.8/contrib/sendmail/libsm/shm.c
stable/0.8/contrib/sendmail/libsm/signal.c
stable/0.8/contrib/sendmail/libsm/smstdio.c
stable/0.8/contrib/sendmail/libsm/snprintf.c
stable/0.8/contrib/sendmail/libsm/sscanf.c
stable/0.8/contrib/sendmail/libsm/stdio.c
stable/0.8/contrib/sendmail/libsm/strcasecmp.c
stable/0.8/contrib/sendmail/libsm/strdup.c
stable/0.8/contrib/sendmail/libsm/strerror.c
stable/0.8/contrib/sendmail/libsm/strexit.c
stable/0.8/contrib/sendmail/libsm/string.c
stable/0.8/contrib/sendmail/libsm/stringf.c
stable/0.8/contrib/sendmail/libsm/strio.c
stable/0.8/contrib/sendmail/libsm/strl.c
stable/0.8/contrib/sendmail/libsm/strrevcmp.c
stable/0.8/contrib/sendmail/libsm/strto.c
stable/0.8/contrib/sendmail/libsm/syslogio.c
stable/0.8/contrib/sendmail/libsm/t-cf.c
stable/0.8/contrib/sendmail/libsm/t-event.c
stable/0.8/contrib/sendmail/libsm/t-exc.c
stable/0.8/contrib/sendmail/libsm/t-fget.c
stable/0.8/contrib/sendmail/libsm/t-float.c
stable/0.8/contrib/sendmail/libsm/t-fopen.c
stable/0.8/contrib/sendmail/libsm/t-heap.c
stable/0.8/contrib/sendmail/libsm/t-match.c
stable/0.8/contrib/sendmail/libsm/t-memstat.c
stable/0.8/contrib/sendmail/libsm/t-path.c
stable/0.8/contrib/sendmail/libsm/t-qic.c
stable/0.8/contrib/sendmail/libsm/t-rpool.c
stable/0.8/contrib/sendmail/libsm/t-scanf.c
stable/0.8/contrib/sendmail/libsm/t-sem.c
stable/0.8/contrib/sendmail/libsm/t-shm.c
stable/0.8/contrib/sendmail/libsm/t-smstdio.c
stable/0.8/contrib/sendmail/libsm/t-string.c
stable/0.8/contrib/sendmail/libsm/t-strio.c
stable/0.8/contrib/sendmail/libsm/t-strl.c
stable/0.8/contrib/sendmail/libsm/t-strrevcmp.c
stable/0.8/contrib/sendmail/libsm/t-types.c
stable/0.8/contrib/sendmail/libsm/test.c
stable/0.8/contrib/sendmail/libsm/ungetc.c
stable/0.8/contrib/sendmail/libsm/util.c
stable/0.8/contrib/sendmail/libsm/vasprintf.c
stable/0.8/contrib/sendmail/libsm/vfprintf.c
stable/0.8/contrib/sendmail/libsm/vfscanf.c
stable/0.8/contrib/sendmail/libsm/vprintf.c
stable/0.8/contrib/sendmail/libsm/vsnprintf.c
stable/0.8/contrib/sendmail/libsm/wbuf.c
stable/0.8/contrib/sendmail/libsm/wsetup.c
stable/0.8/contrib/sendmail/libsm/xtrap.c
stable/0.8/contrib/sendmail/libsmdb/Makefile
stable/0.8/contrib/sendmail/libsmdb/Makefile.m4
stable/0.8/contrib/sendmail/libsmdb/smdb.c
stable/0.8/contrib/sendmail/libsmdb/smdb1.c
stable/0.8/contrib/sendmail/libsmdb/smdb2.c
stable/0.8/contrib/sendmail/libsmdb/smndbm.c
stable/0.8/contrib/sendmail/libsmutil/Makefile
stable/0.8/contrib/sendmail/libsmutil/Makefile.m4
stable/0.8/contrib/sendmail/libsmutil/cf.c
stable/0.8/contrib/sendmail/libsmutil/debug.c
stable/0.8/contrib/sendmail/libsmutil/err.c
stable/0.8/contrib/sendmail/libsmutil/lockfile.c
stable/0.8/contrib/sendmail/libsmutil/safefile.c
stable/0.8/contrib/sendmail/libsmutil/snprintf.c
stable/0.8/contrib/sendmail/mail.local/Makefile
stable/0.8/contrib/sendmail/mail.local/Makefile.m4
stable/0.8/contrib/sendmail/mail.local/README
stable/0.8/contrib/sendmail/mail.local/mail.local.8
stable/0.8/contrib/sendmail/mail.local/mail.local.c
stable/0.8/contrib/sendmail/mailstats/Makefile
stable/0.8/contrib/sendmail/mailstats/Makefile.m4
stable/0.8/contrib/sendmail/mailstats/mailstats.8
stable/0.8/contrib/sendmail/mailstats/mailstats.c
stable/0.8/contrib/sendmail/makemap/Makefile
stable/0.8/contrib/sendmail/makemap/Makefile.m4
stable/0.8/contrib/sendmail/makemap/makemap.8
stable/0.8/contrib/sendmail/makemap/makemap.c
stable/0.8/contrib/sendmail/praliases/Makefile
stable/0.8/contrib/sendmail/praliases/Makefile.m4
stable/0.8/contrib/sendmail/praliases/praliases.8
stable/0.8/contrib/sendmail/praliases/praliases.c
stable/0.8/contrib/sendmail/rmail/Makefile
stable/0.8/contrib/sendmail/rmail/Makefile.m4
stable/0.8/contrib/sendmail/rmail/rmail.8
stable/0.8/contrib/sendmail/rmail/rmail.c
stable/0.8/contrib/sendmail/smrsh/Makefile
stable/0.8/contrib/sendmail/smrsh/Makefile.m4
stable/0.8/contrib/sendmail/smrsh/README
stable/0.8/contrib/sendmail/smrsh/smrsh.8
stable/0.8/contrib/sendmail/smrsh/smrsh.c
stable/0.8/contrib/sendmail/src/Makefile
stable/0.8/contrib/sendmail/src/Makefile.m4
stable/0.8/contrib/sendmail/src/README
stable/0.8/contrib/sendmail/src/SECURITY
stable/0.8/contrib/sendmail/src/TRACEFLAGS
stable/0.8/contrib/sendmail/src/TUNING
stable/0.8/contrib/sendmail/src/alias.c
stable/0.8/contrib/sendmail/src/aliases
stable/0.8/contrib/sendmail/src/aliases.5
stable/0.8/contrib/sendmail/src/arpadate.c
stable/0.8/contrib/sendmail/src/bf.c
stable/0.8/contrib/sendmail/src/bf.h
stable/0.8/contrib/sendmail/src/collect.c
stable/0.8/contrib/sendmail/src/conf.c
stable/0.8/contrib/sendmail/src/conf.h
stable/0.8/contrib/sendmail/src/control.c
stable/0.8/contrib/sendmail/src/convtime.c
stable/0.8/contrib/sendmail/src/daemon.c
stable/0.8/contrib/sendmail/src/daemon.h
stable/0.8/contrib/sendmail/src/deliver.c
stable/0.8/contrib/sendmail/src/domain.c
stable/0.8/contrib/sendmail/src/envelope.c
stable/0.8/contrib/sendmail/src/err.c
stable/0.8/contrib/sendmail/src/headers.c
stable/0.8/contrib/sendmail/src/helpfile
stable/0.8/contrib/sendmail/src/macro.c
stable/0.8/contrib/sendmail/src/mailq.1
stable/0.8/contrib/sendmail/src/main.c
stable/0.8/contrib/sendmail/src/map.c
stable/0.8/contrib/sendmail/src/map.h
stable/0.8/contrib/sendmail/src/mci.c
stable/0.8/contrib/sendmail/src/milter.c
stable/0.8/contrib/sendmail/src/mime.c
stable/0.8/contrib/sendmail/src/newaliases.1
stable/0.8/contrib/sendmail/src/parseaddr.c
stable/0.8/contrib/sendmail/src/queue.c
stable/0.8/contrib/sendmail/src/ratectrl.c
stable/0.8/contrib/sendmail/src/readcf.c
stable/0.8/contrib/sendmail/src/recipient.c
stable/0.8/contrib/sendmail/src/sasl.c
stable/0.8/contrib/sendmail/src/savemail.c
stable/0.8/contrib/sendmail/src/sendmail.8
stable/0.8/contrib/sendmail/src/sendmail.h
stable/0.8/contrib/sendmail/src/sfsasl.c
stable/0.8/contrib/sendmail/src/sfsasl.h
stable/0.8/contrib/sendmail/src/shmticklib.c
stable/0.8/contrib/sendmail/src/sm_resolve.c
stable/0.8/contrib/sendmail/src/sm_resolve.h
stable/0.8/contrib/sendmail/src/srvrsmtp.c
stable/0.8/contrib/sendmail/src/stab.c
stable/0.8/contrib/sendmail/src/stats.c
stable/0.8/contrib/sendmail/src/statusd_shm.h
stable/0.8/contrib/sendmail/src/sysexits.c
stable/0.8/contrib/sendmail/src/timers.c
stable/0.8/contrib/sendmail/src/timers.h
stable/0.8/contrib/sendmail/src/tls.c
stable/0.8/contrib/sendmail/src/trace.c
stable/0.8/contrib/sendmail/src/udb.c
stable/0.8/contrib/sendmail/src/usersmtp.c
stable/0.8/contrib/sendmail/src/util.c
stable/0.8/contrib/sendmail/src/version.c
stable/0.8/contrib/sendmail/test/Makefile
stable/0.8/contrib/sendmail/test/Makefile.m4
stable/0.8/contrib/sendmail/test/README
stable/0.8/contrib/sendmail/test/Results
stable/0.8/contrib/sendmail/test/t_dropgid.c
stable/0.8/contrib/sendmail/test/t_exclopen.c
stable/0.8/contrib/sendmail/test/t_pathconf.c
stable/0.8/contrib/sendmail/test/t_seteuid.c
stable/0.8/contrib/sendmail/test/t_setgid.c
stable/0.8/contrib/sendmail/test/t_setreuid.c
stable/0.8/contrib/sendmail/test/t_setuid.c
stable/0.8/contrib/sendmail/test/t_snprintf.c
stable/0.8/contrib/sendmail/vacation/Makefile
stable/0.8/contrib/sendmail/vacation/Makefile.m4
stable/0.8/contrib/sendmail/vacation/vacation.1
stable/0.8/contrib/sendmail/vacation/vacation.c
stable/0.8/etc/sendmail/midnightbsd.mc
stable/0.8/etc/sendmail/midnightbsd.submit.mc
stable/0.8/sys/conf/newvers.sh
Added Paths:
-----------
stable/0.8/contrib/sendmail/cf/feature/bcc.m4
stable/0.8/contrib/sendmail/cf/feature/nopercenthack.m4
stable/0.8/contrib/sendmail/cf/feature/prefixmod.m4
stable/0.8/contrib/sendmail/cf/feature/tls_session_features.m4
stable/0.8/contrib/sendmail/cf/hack/xconnect.m4
stable/0.8/contrib/sendmail/contrib/AuthRealm.p0
stable/0.8/contrib/sendmail/devtools/
stable/0.8/contrib/sendmail/doc/op/op.ps
stable/0.8/contrib/sendmail/editmap/editmap.0
stable/0.8/contrib/sendmail/libsm/inet6_ntop.c
stable/0.8/contrib/sendmail/libsm/t-inet6_ntop.c
stable/0.8/contrib/sendmail/mail.local/mail.local.0
stable/0.8/contrib/sendmail/mailstats/mailstats.0
stable/0.8/contrib/sendmail/makemap/makemap.0
stable/0.8/contrib/sendmail/praliases/praliases.0
stable/0.8/contrib/sendmail/rmail/rmail.0
stable/0.8/contrib/sendmail/smrsh/smrsh.0
stable/0.8/contrib/sendmail/src/aliases.0
stable/0.8/contrib/sendmail/src/mailq.0
stable/0.8/contrib/sendmail/src/makesendmail
stable/0.8/contrib/sendmail/src/newaliases.0
stable/0.8/contrib/sendmail/src/sendmail.0
stable/0.8/contrib/sendmail/src/sysexits.h
stable/0.8/contrib/sendmail/vacation/vacation.0
Removed Paths:
-------------
stable/0.8/contrib/sendmail/devtools/bin/Build
Property Changed:
----------------
stable/0.8/
stable/0.8/contrib/sendmail/
stable/0.8/contrib/sendmail/contrib/bounce-resender.pl
stable/0.8/contrib/sendmail/contrib/buildvirtuser
stable/0.8/contrib/sendmail/contrib/cidrexpand
stable/0.8/contrib/sendmail/contrib/etrn.pl
stable/0.8/contrib/sendmail/contrib/expn.pl
stable/0.8/contrib/sendmail/contrib/movemail.pl
stable/0.8/contrib/sendmail/contrib/passwd-to-alias.pl
stable/0.8/contrib/sendmail/contrib/qtool.pl
stable/0.8/contrib/sendmail/contrib/smcontrol.pl
stable/0.8/contrib/sendmail/contrib/socketmapClient.pl
stable/0.8/contrib/sendmail/contrib/socketmapServer.pl
Index: stable/0.8
===================================================================
--- stable/0.8 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8 2016-10-01 17:46:48 UTC (rev 9102)
Property changes on: stable/0.8
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:7563-7565,7613-7616,8594,8596
\ No newline at end of property
+/trunk:7563-7565,7613-7616,8594,8596,9097-9099
\ No newline at end of property
Modified: stable/0.8/UPDATING
===================================================================
--- stable/0.8/UPDATING 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/UPDATING 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,12 @@
Updating Information for MidnightBSD users.
+20161001:
+ MidnightBSD 0.8.2 RELEASE
+
+ Fix a regression with OpenSSL security.
+
+ Sendmail 8.15.2
+
20160923:
MidnightBSD 0.8.1 RELEASE
Index: stable/0.8/contrib/sendmail
===================================================================
--- stable/0.8/contrib/sendmail 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail 2016-10-01 17:46:48 UTC (rev 9102)
Property changes on: stable/0.8/contrib/sendmail
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1,3 ##
+/branches/SENDMAIL/contrib/sendmail:5961-6376
+/trunk/contrib/sendmail:7563-7565,7613-7616,8594,8596,9097-9098
+/vendor/sendmail/dist:6377-9096
\ No newline at end of property
Modified: stable/0.8/contrib/sendmail/CACerts
===================================================================
--- stable/0.8/contrib/sendmail/CACerts 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/CACerts 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# $Id: CACerts,v 1.1.1.6 2013-08-14 22:35:46 laffer1 Exp $
+# $Id: CACerts,v 8.6 2013-01-18 15:14:17 ca Exp $
# This file contains some CA certificates that are used to sign the
# certificates of mail servers of members of the sendmail consortium
# who may reply to questions etc sent to sendmail.org.
@@ -10,6 +10,102 @@
Data:
Version: 3 (0x2)
Serial Number:
+ 92:91:67:de:e0:ef:2c:e4
+ Signature Algorithm: sha1WithRSAEncryption
+ Issuer: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2015/emailAddress=ca+ca-rsa2015 at esmtp.org
+ Validity
+ Not Before: Mar 2 19:15:29 2015 GMT
+ Not After : Mar 1 19:15:29 2018 GMT
+ Subject: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2015/emailAddress=ca+ca-rsa2015 at esmtp.org
+ Subject Public Key Info:
+ Public Key Algorithm: rsaEncryption
+ Public-Key: (2048 bit)
+ Modulus:
+ 00:b9:1a:a1:56:ce:cb:16:af:4f:96:ba:2a:70:31:
+ 70:d3:86:6c:7a:46:26:47:42:3f:de:49:57:3e:08:
+ 1e:10:25:bf:06:8f:ca:fd:f4:5e:6a:01:7d:31:4d:
+ 50:88:18:43:71:66:65:42:9c:90:97:0d:95:f2:14:
+ ef:d7:5e:77:ef:7d:b5:49:3f:02:bb:83:20:f7:e6:
+ fc:9a:cd:13:df:60:41:28:8e:39:07:a6:a4:40:98:
+ 15:1e:46:b6:04:2e:f9:ab:32:d1:8b:fe:52:81:f1:
+ d2:e1:c3:cf:bf:ab:40:a7:f0:e4:e5:a2:82:37:30:
+ 8c:10:7d:aa:a8:7c:7e:76:cc:5f:1a:24:d0:8c:94:
+ f6:f2:7f:4a:be:2f:38:67:c0:06:e6:9e:51:ad:55:
+ d0:cb:26:71:cf:f4:af:7d:5a:41:81:16:fb:26:ec:
+ f0:35:01:6e:db:f9:e9:00:d7:d0:89:7b:cf:88:16:
+ 8b:1c:8f:77:1f:5d:ef:70:04:28:76:c5:1b:c6:23:
+ 8d:49:6b:f0:b8:21:56:d6:7d:68:6c:be:21:e3:e6:
+ e3:1d:6f:a5:ea:dc:83:e4:27:b3:6f:5f:1b:3d:33:
+ a1:d5:d3:f0:73:1a:12:eb:d9:95:00:71:59:16:b4:
+ e4:60:38:b2:2e:7f:b7:d4:c5:e9:3f:74:e4:48:38:
+ 29:89
+ Exponent: 65537 (0x10001)
+ X509v3 extensions:
+ X509v3 Subject Key Identifier:
+ B1:69:DB:5E:9B:CE:1A:B4:1D:B2:6A:FC:5A:22:97:B6:24:14:6F:32
+ X509v3 Authority Key Identifier:
+ keyid:B1:69:DB:5E:9B:CE:1A:B4:1D:B2:6A:FC:5A:22:97:B6:24:14:6F:32
+ DirName:/C=US/ST=California/L=Berkeley/O=Endmail Org/OU=MTA/CN=Claus Assmann CA RSA 2015/emailAddress=ca+ca-rsa2015 at esmtp.org
+ serial:92:91:67:DE:E0:EF:2C:E4
+
+ X509v3 Basic Constraints:
+ CA:TRUE
+ X509v3 Subject Alternative Name:
+ email:ca+ca-rsa2015 at esmtp.org
+ X509v3 Issuer Alternative Name:
+ email:ca+ca-rsa2015 at esmtp.org
+ Signature Algorithm: sha1WithRSAEncryption
+ 0a:ce:07:39:77:08:c5:3a:00:04:e8:a0:3b:f7:d2:4c:79:02:
+ 23:0b:da:c0:55:39:82:71:0a:0c:83:e2:de:f2:3b:fe:23:bc:
+ 9b:13:34:d1:29:0a:16:3f:01:7d:9f:fb:4b:aa:12:dc:3b:7e:
+ b9:27:7b:ec:0c:3f:c0:d9:f5:d8:a8:a1:9c:1c:3a:2f:40:df:
+ 27:1a:1a:a0:74:00:19:b7:82:0e:f9:45:86:bf:32:da:0e:72:
+ 0a:4c:2c:39:21:63:c3:1f:61:6e:e2:4d:ba:7a:26:1a:15:ce:
+ b1:f6:1a:59:04:70:ed:e8:72:05:4c:fc:84:c6:a5:f4:e2:4a:
+ 40:e4:42:70:87:9a:a7:02:26:3a:47:34:09:e0:7b:88:ca:fb:
+ 99:d9:9b:bb:0c:52:8a:93:d5:59:30:0b:55:42:b4:bb:d2:b1:
+ 49:55:81:a4:70:a0:49:19:f2:4f:61:94:af:e9:d7:62:68:65:
+ 97:67:00:26:b8:9b:b2:2c:d0:2c:83:7d:3e:b3:31:73:b9:55:
+ 49:53:fa:a3:ad:1b:02:67:08:9e:ce:9e:eb:9f:47:0d:6c:95:
+ e9:6c:30:92:c1:94:67:ad:d9:e3:b9:61:ea:a9:72:98:81:3a:
+ 62:80:70:20:9a:3e:c4:1f:6f:bd:b4:00:ec:b1:fe:71:da:91:
+ 15:89:f7:8f
+-----BEGIN CERTIFICATE-----
+MIIFJzCCBA+gAwIBAgIJAJKRZ97g7yzkMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYD
+VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTERMA8GA1UEBwwIQmVya2VsZXkx
+FDASBgNVBAoMC0VuZG1haWwgT3JnMQwwCgYDVQQLDANNVEExIjAgBgNVBAMMGUNs
+YXVzIEFzc21hbm4gQ0EgUlNBIDIwMTUxJjAkBgkqhkiG9w0BCQEWF2NhK2NhLXJz
+YTIwMTVAZXNtdHAub3JnMB4XDTE1MDMwMjE5MTUyOVoXDTE4MDMwMTE5MTUyOVow
+gaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhC
+ZXJrZWxleTEUMBIGA1UECgwLRW5kbWFpbCBPcmcxDDAKBgNVBAsMA01UQTEiMCAG
+A1UEAwwZQ2xhdXMgQXNzbWFubiBDQSBSU0EgMjAxNTEmMCQGCSqGSIb3DQEJARYX
+Y2ErY2EtcnNhMjAxNUBlc210cC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQC5GqFWzssWr0+WuipwMXDThmx6RiZHQj/eSVc+CB4QJb8Gj8r99F5q
+AX0xTVCIGENxZmVCnJCXDZXyFO/XXnfvfbVJPwK7gyD35vyazRPfYEEojjkHpqRA
+mBUeRrYELvmrMtGL/lKB8dLhw8+/q0Cn8OTlooI3MIwQfaqofH52zF8aJNCMlPby
+f0q+LzhnwAbmnlGtVdDLJnHP9K99WkGBFvsm7PA1AW7b+ekA19CJe8+IFoscj3cf
+Xe9wBCh2xRvGI41Ja/C4IVbWfWhsviHj5uMdb6Xq3IPkJ7NvXxs9M6HV0/BzGhLr
+2ZUAcVkWtORgOLIuf7fUxek/dORIOCmJAgMBAAGjggFWMIIBUjAdBgNVHQ4EFgQU
+sWnbXpvOGrQdsmr8WiKXtiQUbzIwgdoGA1UdIwSB0jCBz4AUsWnbXpvOGrQdsmr8
+WiKXtiQUbzKhgaukgagwgaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9y
+bmlhMREwDwYDVQQHDAhCZXJrZWxleTEUMBIGA1UECgwLRW5kbWFpbCBPcmcxDDAK
+BgNVBAsMA01UQTEiMCAGA1UEAwwZQ2xhdXMgQXNzbWFubiBDQSBSU0EgMjAxNTEm
+MCQGCSqGSIb3DQEJARYXY2ErY2EtcnNhMjAxNUBlc210cC5vcmeCCQCSkWfe4O8s
+5DAMBgNVHRMEBTADAQH/MCIGA1UdEQQbMBmBF2NhK2NhLXJzYTIwMTVAZXNtdHAu
+b3JnMCIGA1UdEgQbMBmBF2NhK2NhLXJzYTIwMTVAZXNtdHAub3JnMA0GCSqGSIb3
+DQEBBQUAA4IBAQAKzgc5dwjFOgAE6KA799JMeQIjC9rAVTmCcQoMg+Le8jv+I7yb
+EzTRKQoWPwF9n/tLqhLcO365J3vsDD/A2fXYqKGcHDovQN8nGhqgdAAZt4IO+UWG
+vzLaDnIKTCw5IWPDH2Fu4k26eiYaFc6x9hpZBHDt6HIFTPyExqX04kpA5EJwh5qn
+AiY6RzQJ4HuIyvuZ2Zu7DFKKk9VZMAtVQrS70rFJVYGkcKBJGfJPYZSv6ddiaGWX
+ZwAmuJuyLNAsg30+szFzuVVJU/qjrRsCZwiezp7rn0cNbJXpbDCSwZRnrdnjuWHq
+qXKYgTpigHAgmj7EH2+9tADssf5x2pEVifeP
+-----END CERTIFICATE-----
+
+
+Certificate:
+ Data:
+ Version: 3 (0x2)
+ Serial Number:
f1:41:b3:3d:ba:bd:33:49
Signature Algorithm: sha1WithRSAEncryption
Issuer: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2012/emailAddress=ca+ca-rsa2012 at esmtp.org
Modified: stable/0.8/contrib/sendmail/FAQ
===================================================================
--- stable/0.8/contrib/sendmail/FAQ 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/FAQ 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,8 +1,4 @@
The FAQ is no longer maintained with the sendmail release. It is
available at http://www.sendmail.org/faq/ .
-A plain-text version of the questions only, with URLs referring to
-the answers, is posted to comp.mail.sendmail on the 10th and 25th
-of each month.
-
-$Revision: 1.1.1.2 $, Last updated $Date: 2006-02-25 02:33:53 $
+$Revision: 8.25 $, Last updated $Date: 2014-01-27 12:49:52 $
Modified: stable/0.8/contrib/sendmail/INSTALL
===================================================================
--- stable/0.8/contrib/sendmail/INSTALL 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/INSTALL 2016-10-01 17:46:48 UTC (rev 9102)
@@ -28,8 +28,9 @@
/etc/mail/submit.cf. This can be done in the cf/cf by using
"sh ./Build install-cf".
- Please read sendmail/SECURITY before continuing; you have to create a
- new user smmsp and a new group smmsp for the default installation.
+ Please read sendmail/SECURITY before continuing; you may have to create
+ a new user smmsp and a new group smmsp for the default installation
+ if you are updating from a really old version.
Then install the sendmail binary built in step 3 by cd-ing back to
sendmail/ and running "sh ./Build install".
@@ -43,4 +44,4 @@
in case you are now using a different (and thereby incompatible) version
of Berkeley DB.
-$Revision: 1.1.1.3 $, Last updated $Date: 2007-11-23 22:10:29 $
+$Revision: 8.16 $, Last updated $Date: 2007-10-03 21:00:28 $
Modified: stable/0.8/contrib/sendmail/KNOWNBUGS
===================================================================
--- stable/0.8/contrib/sendmail/KNOWNBUGS 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/KNOWNBUGS 2016-10-01 17:46:48 UTC (rev 9102)
@@ -62,9 +62,9 @@
libmilter and hence the communication fails. This can be avoided by
increasing the constant MILTER_CHUNK_SIZE in
include/libmilter/mfdef.h and recompiling sendmail, libmilter, and
- all (statically linked) milters (or by using an undocumented compile
- time option: _FFR_MAXDATASIZE; you have to read the source code in
- order to use this properly).
+ all (statically linked) milters (or by using undocumented compile
+ time options: _FFR_MAXDATASIZE/_FFR_MDS_NEGOTIATE; you have to
+ read the source code in order to use these properly).
* Sender addresses whose domain part cause a temporary A record lookup
failure but have a valid MX record will be temporarily rejected in
@@ -102,6 +102,11 @@
Header addresses that have the \231 character (and possibly others
in the range \201 - \237) behave in odd and usually unexpected ways.
+* AuthRealm for Cyrus SASL may not work as expected. The man page
+ and the actual usage for sasl_server_new() seem to differ.
+ Feedback for the "correct" usage is welcome, a patch to match
+ the description of the man page is in contrib/AuthRealm.p0.
+
* accept() problem on SVR4.
Apparently, the sendmail daemon loop (doing accept()s on the network)
@@ -252,7 +257,7 @@
* Race condition for delivery to set-user-ID files
- Sendmail will deliver to a fail if the file is owned by the DefaultUser
+ Sendmail will deliver to a file 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
back to it's original settings. Unfortunately, there's still a
@@ -266,4 +271,4 @@
be used if set instead of LOCAL_RELAY ($R). This will be fixed in a
future version.
-$Revision: 1.1.1.5 $, Last updated $Date: 2011-05-17 22:19:50 $
+$Revision: 8.61 $, Last updated $Date: 2011-04-07 17:48:23 $
Modified: stable/0.8/contrib/sendmail/LICENSE
===================================================================
--- stable/0.8/contrib/sendmail/LICENSE 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/LICENSE 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,9 +1,9 @@
SENDMAIL LICENSE
-The following license terms and conditions apply, unless a redistribution
-agreement or other license is obtained from Sendmail, Inc., 6475 Christie
-Ave, Third Floor, Emeryville, CA 94608, USA, or by electronic mail at
-license at sendmail.com.
+The following license terms and conditions apply, unless a redistribution
+agreement or other license is obtained from Proofpoint, Inc., 892
+Ross Street, Sunnyvale, CA, 94089, USA, or by electronic mail at
+sendmail-license at proofpoint.com.
License Terms:
@@ -35,12 +35,12 @@
forth as paragraph 6 below, in the documentation and/or other materials
provided with the distribution. For the purposes of binary distribution
the "Copyright Notice" refers to the following language:
- "Copyright (c) 1998-2012 Sendmail, Inc. All rights reserved."
+ "Copyright (c) 1998-2014 Proofpoint, Inc. All rights reserved."
-4. Neither the name of Sendmail, Inc. nor the University of California nor
+4. Neither the name of Proofpoint, Inc. nor the University of California nor
names of their contributors may be used to endorse or promote
products derived from this software without specific prior written
- permission. The name "sendmail" is a trademark of Sendmail, Inc.
+ permission. The name "sendmail" is a trademark of Proofpoint, Inc.
5. All redistributions must comply with the conditions imposed by the
University of California on certain embedded code, which copyright
@@ -78,4 +78,4 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-$Revision: 1.1.1.5 $, Last updated $Date: 2013-08-14 22:35:46 $, Document 139848.1
+$Revision: 8.23 $, Last updated $Date: 2014-01-26 20:10:01 $, Document 139848.1
Modified: stable/0.8/contrib/sendmail/Makefile
===================================================================
--- stable/0.8/contrib/sendmail/Makefile 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/Makefile 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.2 2006-02-25 02:33:53 laffer1 Exp $
+# $Id: Makefile.dist,v 8.15 2001-08-23 20:44:39 ca Exp $
SHELL= /bin/sh
SUBDIRS= libsm libsmutil libsmdb sendmail editmap mail.local \
Modified: stable/0.8/contrib/sendmail/PGPKEYS
===================================================================
--- stable/0.8/contrib/sendmail/PGPKEYS 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/PGPKEYS 2016-10-01 17:46:48 UTC (rev 9102)
@@ -141,7 +141,364 @@
=SR28
-----END PGP PUBLIC KEY BLOCK-----
+
+pub 2048R/0xAAF5B5DE05BDCC53 2015-01-02
+fingerprint: 30BC A747 05FA 4154 5573 1D7B AAF5 B5DE 05BD CC53
+uid Sendmail Signing Key/2015 <sendmail at Sendmail.ORG>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQENBFSl4rQBCADRCzgFSJkzyoOHw9/9L/+G3mzA1fWR7TgCE0WxGX7PDzyLDaUS
+a4XpCDtadjXyr7c5YPo1T7ybxUH39yvUgEHBiPQDssik+bbpOiHL7V0sUDAYfKSq
+YC8/MG42Oj/zd+0WUhnI+RckFYPBNDQ+sZC6ErLDxCYDZMYhG4vhJOGqAKpglNTb
+w4Fdx4LNmL3e4t3z4IEtnzAqeGVxIZm8MGGFhKkb8ufpgh8Jiz4Q6cOis0ZD9K6f
+LvMPRJXSBy9jBtmS2oI2e9Q5LLhmzd1PVyA8jwAlK0QfJLmlRrgRUfHFKhkf+EuW
+tTi592OYCZ9bw7QVSiGVQUK+7VACfM+FQR81ABEBAAG0MVNlbmRtYWlsIFNpZ25p
+bmcgS2V5LzIwMTUgPHNlbmRtYWlsQFNlbmRtYWlsLk9SRz6JATgEEwECACIFAlSl
+4rQCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEKr1td4FvcxTTPMH/29J
+kNmt6EGNo/eLQySB8HTenfJjZaQxwPRhq22kWgr/7WP1BR2411bopyNk4IZ0rcDr
+tnyeJj4UWKJljVuXyTDQPtU8uUlgiOT8QiHEbge7MOzxrn0cy6KIOgKq+vtuxa28
+McaxjENR7XVIDFkesQ7P/yLkcCjlE6jaD4r9OIKpqEVMPs1WUFff+rsgTo7mdcgR
+QowQOgYqNil5awQ5Y2Gol71hZ6oRcpqMwSd6w4dEEx2U8rF8oqJuoxeUTgNCSv0n
+iFtewLznocmxlrxe1mQAeLfRmUAG4LSL6p5wx1lRjJA3gtyWRjY0404jGxkATLG4
+AtK2OkHj8MbrWLP7PKyJARwEEAECAAYFAlSl5AQACgkQYd4R7OJ2OnPHXAf/Y6Rk
+rROF45+SgbsEIiDXQBcBOoO1GKe0nFTc1jfAKUHAQ94fqcDxNeFRA9fNIA2d7XNI
+0Lw6W7X3RcEkF58xytIe/Y+EXDmOt/BUbpch9KIz6J9pqBhPdyHvG+ZeyA3A+TGT
+ZGnnnAxNFtCjt2IID9lzZSLuWhH8+DNC2Vp15NngDTa1VIk17n5iIvi7r3V5cdIE
+MblKLGm+ZaiTeccVLjwMKIUSgrLP87+yF/aaZH2kotuI7f3tD1ycN0sVZJxcFS+c
+GFw7uvOarDBSm0Q/FgfhDUOJLy4w5SqVmgPEIAeogz94q0JXxSSr1XWQBD8X9XwF
+f3+dPXmgMHXLGRWclYkBHAQQAQIABgUCVKXkPAAKCRA9aLJdUgfK08cnB/96BV+v
+xyBx35TPg8eI/WIskdQAIpCQsm6FoO1ejbMzfWn9bImCewOp1UMlowdfQC52Hdp8
+EXnuwCpJ3rtnZctRld5dNM/clbZ+r3lr78wX7hqPUajlvxe+TMpyZbJirLn1f5Ba
+yoysE4oICfzJivPfixZd7oFVr9EkftbatYenl0rgf/0lJTKRDIqNGezeeyfxaKdX
+qd545wqis7PrrXDOrEq815aosG09KQBhIoPgti2us1R95nSm9z6dVCY/nSDOxL+a
+Vyq/XD5KSUqbZVocY+fbR3dNX5haTvawuG0GPvl+YvYb2lW4hhi7Q4aUL7Dd4c9c
+vk5+WAvfJwHtbxrgiQEcBBABAgAGBQJUpeREAAoJEI5a6fvO7vQ7OWUH/2NNxhlI
+JEtvD+Nj2oPGgVQJrlFI1pbzyMCtD+6iy8Lfnp2DK+qKPMjBw96LUqcXC32VFPQr
+17iyZDv26MSb/acmdIfTPpPTwJ6zEmMI8mXradeuoiWxeVHSg7n+D3u0xtikmb9Y
+uRKv0yx43fcL70bqV5DzyXQte0chfRnOiwMrImWdgDekkmxE9udbtgK24rifNVGa
+TBB6eHJAsFVu5Y38hsZLe10bCKyUCqT6Qywfy3RCMpXYeo6fXOk0fKatG2oi3CZp
+LI+AnjmAJ0t2oMkrwUxogkK3LkShJT/aJYIR24eZm0GdzwRHZxXKClGFvdJslIea
+TKHSXNK41eEIfreJARwEEAECAAYFAlSl5EgACgkQOaTHfal4hLAXfwf+M0YmlHd4
+1sfvckYhOYf99n1BGnfQx5RJn+X+EBjGyOfPKMBPQuZIlwAI20T+cFnR3WmgrmlO
+IBG8qVcSDoValzNPcr0V3WGDrT75fYhf5iYj2ZsZDBUqE1VF3dAVUw40x2c1n+98
+7lbq3NtolSPYk07h5rhEhmkjdNcixv/exVCTGVwaT4X9ZHY8heETmF5tsCtPavpr
+i/DjcDQQQ0sQ8um1eX41j2bhrN4MERUC5oadvSULaA2QUoWgCrzVG8zx715Au77N
+jLtfA31hJI0GP/dpSREaYlqA0nwVDR5tz1TyTNwPN1ylxjQmjKXtJwx3jUtlT9Zh
+qxRf+ngYHpWArokBHAQQAQIABgUCVKXkTAAKCRBgTfvyhUEKvl11B/9aYJBEEQZp
+JWAT6HPmQK//i2x4y1euQfaHsjqJALvvPrgiTp/ZE3o6dKHhs+SbawsB57RtootN
+maQr7x2drvBojWhJJdaouAh345qOfZYb0bD9klkr6W+Mjl5T0xWIKFEyIZn0Tcbr
+8ekHgSIx2trL8LduSJou2bdPMh46PORzEpuQQ4IAyV0uRyBdNFOPwTy2OdXs51fr
+M7lp1hJp84+y2a6z3vz3VCs2A9LzlnXKZ6bXljpd5dQfrmrSNXltPKA3jVLkWi8+
+rh9f1rAGsj1e6N1aVF2uJ1Y3u+U0XQ/dwa1vDF3y4KVObxYM9eNGbF4J8lGkUy2a
+gZ1s1X8QzEDUiJwEEAECAAYFAlSl5FAACgkQEolum6d/JCmUSQP+KEz6xSvPSbFP
+Hip4JiX1Wbvd+t3TyL0u9Fv/POwUrFIHVpTkCwOz6jsBH3TdGGiYOP5F8k/US2jU
+3WB0J1mK5Rn3GwLhUGNTEeuaJZCuKE+j3qwMFmDqC/2IxEvlWtrIbTqkgf7cRv/O
+O7VNv+EL0axtsrOcwZlUWe6Lc4571oaInAQQAQIABgUCVKXkUwAKCRDYqvDK9rMH
+KX7xBACUFTBRCmboY/GRTHMZW1DGfcO2vMxwnYKqWomuzi/YonDCWtoTpeMDaAhY
+NnIchC1mlYteIE94/+ZsoYsZeaR3fe7CN6h/deBu4tW/dQ+TW1ZPF6EuVhoviKgz
+rd3rb+gcS0f0PgSPyg5LGtoMGMD9/gx1NJOTFec83jmBI95Gb4icBBABAgAGBQJU
+peRXAAoJEJdDARhwk7hBAUED/0oyeD2Z4wMQ6IQEprOAWbR+vIRzaThemmCGobRw
+UlM44nUXqKSM1+naLEVz/JzBuKWG00zTz6Su3NesWoFzDDUGYcIJggbOm39Pc+V8
+eXV86An64/v3P6gypJc+q9P+FFGGO884wFmYN634Mi4SDBVFUzffcghueAFcxtzt
+0mH5iJwEEAECAAYFAlSl5FoACgkQHnuzyK+VliVGdwP/fmdK9MdWIzPD/6eYm6JZ
+zbksaGWiqpwgp9IEr/OhSmGkXuwUsP35PFJ8FsJbEV5x/y6pP3UNp6EFRN/116ue
+jp5vVM7nnj2K3V8f85J4dXCRbv+kek+Ufo1Qzm5kgvRuBxX1sXpxFX6yBM0Y6WuV
+gszdbTVNlS04q6bnPFE9L4uInAQQAQIABgUCVKXkXgAKCRBwoCRNHvmSUZ/7A/9W
+yQJrrdrs2SuYtoxov/pL/TVMejbnxsF8Y0dRtM/KiquP57PMQSmLqy4fTRzAMHBv
+XK1aKfewTVfGKLcHIzfMfv2XcPpWfwcyMeZKtcSr25lWl9GJZP221rCok76XYwqk
+BPPp0pjSwdy0Qq4sd3N3ESZmqAMWJ7ouMmlQ7VWReYicBBABAgAGBQJUpeRhAAoJ
+EMjV7SmV9hdxLv0EALX3yjI2KDNG1mo5ctCSYlIlhXHQ6csHuUK9lzj9R1gVEzDU
+0dEZH0+a5UXh5xf8nyTDLytUe8PxTtPit3AOP6TvTJlANULh/3MKS6317RwUe2e0
+OitWbhQAOYfpYAkSdXZACzPacxrefkxmSM3Pq+SYoumZTI2N6AvVu8MeCS0GiJwE
+EAECAAYFAlSl5GQACgkQIYPhsTlvB4mWJgP/XAlvlBityADJkdN+3mp/OtdYzw04
++dBdNtmLqWUiMZg6rPPHUQi7dfBKi95FFe2U8hxSRk8oLzSzmh/M/CP72mxKh4pi
+PbmEkmKHYlNdyfCCNqXdjkBXFAKXAes/4DaBlZwvLjPtrupEaW2eYdU8cSrdeGuv
+1PMLRPxRr3nPCb+InAQQAQIABgUCVKXkaAAKCRCJaWK4Z4wKA3ZVA/4iYD+xrYv0
+8I+0GZJRdEL5f7T97a7Vtf5xSxUhHDww4xC9gs8LzEGWZXoNaZEVl4j+63EnCIbY
+o4g+c4m81D5NWFqeJWhWpcyvejo9hfGM3ZK/XbiF+ZTzznU5YJclGaZ7t8TY8gcx
+GSWxUzxBJQcSEzAKKi286ielMAXocNx10oicBBABAgAGBQJUpeRrAAoJEDgi20fM
+N08tDkwD/2F5j5irsDw+MQyLKpfPv3GRJ5J3ebOPpLQkQ5T34+qeIw4LkcXW9OJA
+ohW47JLb7R8zwAlUoqmmNXtxTM0r0FlTYGPOVEnSEkMqqa3KR68B3jWAGXXdqig9
+yBxYRleawQ4ltnegBn8q7gC4MwnIAZxzK+Y8cM0Rk/FjC9+NhwrviJwEEAECAAYF
+AlSl5G8ACgkQnBy94uNcVjUfvgQAlQijnoE3de1CanB0JqIN+h+XOLOpalFti+B7
+Swc2ZlnlQ9mofYPK5UHlbsiC7/TilD6xm4YEFKim9sOIMi8FNka8+EH+/d1DmS4M
+qVPDssxTG6VOzn7tYOuC9qIw15IpfbHW2bk/YIImwP9nViKCMLIGw+ZgK+uiRQx9
+fT8O1NqInAQQAQIABgUCVKXkcgAKCRBvUpPYo5umVYKeA/9n63K1nF3DNY3Hckvz
+tN8OrPmyCIOh+7t4sc5NHhTK0+BQTv+cgG6ig7K2cdI6VBAovs/c/u7+RrcMhp7l
+45AVnycfKcNaMHKFyMHDk9FZgpRG/bv1zwDxdh+scUc3IekqkSiQ2wTjDQ5Q/BMK
+L5zfOSnTOoltWjpVgsjdM75Ol4icBBABAgAGBQJUpeR2AAoJEO9YlmTUMuGd8R0D
+/3mhriMu/cp3DXHnlDykqLJI1q5K4xCHOWwFYZ8DxW116AVjluJYYW1HmWcJrjK3
+cwuN3FUcsIjafanIJWCsdeZaPAyFEfUBEW0YXIIpBXRw2N7jNtrd5X6Zjptd+zW+
+4dUzvT1pqVtdPHjova3fcGLSmcdZYbddotaGi7xi7kXviJwEEAECAAYFAlSl5HoA
+CgkQwZwdJRLTRh0iwwP/Y/pwp9ttAMuQUz6oH71BTkUrzu9LiI7vhrYxEquFdzCO
+dE4jBNB3LGfwzjhJRtjmQ/gVhjXWWrDYnOXt3gNxb9KzmTHmSDu65cBxX54Un0pZ
++MXjjWOT2l8+GA1lXeICIoZjJL88/zEZAiaH67ch2LEix1fOaJmXJzUSmP1pR3KI
+nAQQAQIABgUCVKXkfgAKCRDAKcpAFvTM6XVwA/9Eb+Dwn2lmEFFo64gj8ocpWzP8
+/sD86PP5KkZ+b/HQnGB3lsQTwsGytDvJfutLDa05sS/HWZ9wXPltX/G3omp/A1G5
+qEKzVSe0vEWedpf9wn82Ll6hzaiS5qX7r0+FpyUjY8arNrze5S4Q6Q2kjl8YduXl
+wG877igRHkGpAtApxYhGBBARAgAGBQJUpeSHAAoJEBj1A4AkwngCRCMAnjHfd5db
+KK6DJxrWVnEbyXs/QJGKAJsErKkiUX55B8k/P3cyzyXIaOujBYicBBABAgAGBQJU
+peSOAAoJEHxLZ22gDhVjCDQD/j7DE5wyhpjHrtf0hsQcaQoVHWZb2JTLZUMRAQyj
+zKMTSs0GslamlxLZmyV1HqkB+41zuJeBQtRV4gjqa5DQmWDRC2mHl7o9A40v4SDa
+O1jmfU5hfJSMecucPyEcfaAG4BIMvBo6TL484uHBi45SN4Ik3f2wc6D1XOluD1vB
+gIwpiJwEEAECAAYFAlSl5JMACgkQ1uCh/k++Kt2s6gP/RNcMKtx4u61vz+Aji/Fa
+H9q03JxQaRgmN1q2AvZQ/NTWTXU7Y5GnH4kW/8rOoUQiR+agJsvTt4ciM+y33pZ/
+ZZLkAuo0uKelEHhdQhtRbSktKBHSgDWbiqaJJIxazeLpxcSgaoM6RW/7aIFdMtEl
+ALAzTACYlTN/nKWWICn8GnGIRgQQEQIABgUCVKXkmAAKCRAh+cW892qb9aWOAKCg
+aznvUX8PIvKPzoHld39xWlJ+FgCg76wrEc1h9IiIgUoqH5NWVCxcHneInAQQAQIA
+BgUCVKXkngAKCRC92o/WP+p9/ancA/0Z4JHZT7NRBMr47zQvSwE4eLpSE5QDGXi7
+RNmOUgZxrxsFWRZLJCVupXDBQVZEhOBRZYqXPw1eDglOU952oj5OjaHsYnSEu7jz
+VUwlp2BxZQ3mnepdUcQz1A3k2cPZ0I6KFP9hP88GU+77nubB7IqRH/Q3QKMgO0eW
+yd5kYugyYYkBHAQQAQIABgUCVKXkpwAKCRC9J20ub8+ohR46CADMEvAns+L+BkVN
+d9INsiR1rONrNRPT6w4dnBeTLaykkuMjc6+7s+UuXm6AMAelI28pG+fJyt/lZAGx
+QLS9zFgREge0lVbOZVeAYeC1YyFsrJE4Lr2quq3fajj23tnsHmCv16znMHrh/E1m
+Udm4145NprijrZn+PsjuVWYV+pxiLpLM0YBdGNwCEMi/KCQ1fcaiAZZWSqLmHIe0
+ubWDdqq8/5JRQ22SEnqP2FT/lfOmKTxMNmE0uEr4+C4fG2nd38BvzpHu9eN/4Nwx
+IwzK5DhbAj+I57+VDncgkNGe1q4QY/5LaZQh/nHIcmX1ln23f9Lxkr6EYYZ1ptq+
+A8buvD+XiQEcBBABAgAGBQJUp+zrAAoJEBCQryClqlvm6AgIAKAR8HY4G9AD2jDb
+ouS4Al4QICagwQ0Y7Rc2/fHyPQEAP714EimakPFVFDbSD6SW569Qtdxr+ggH4wFI
+bzd21pCgIUC6nVoDotIjplMdYkNfq8AODpxn3HTBnNQ7e609xnWxFo/+httKoWok
+fEP9qZk4MJq7lE75iX+wohjLwoF6v0tCB8CrBFJcfKrDvXQSGvKiaEp4g0sEfyXv
+gL6X0xKMflupofdnFLJliV0WqGhBOGUghPdLsA02E3e1utj6WABmudMytRxWB8is
+SWGaywaEKLSdCgi+XlQVypKeWNMbZZZcftVZ91r4iNTAkw4cv5Wea+YnngfurGCq
+J/jUq7aJAiIEEgEKAAwFAlSn7r4FgweGH4AACgkQZhs61tgqu9C9Aw/+JMTXzwni
+NPwBxkbcNWbnWODVEElmDloHNpr3z+ryF1XNgbiOY8dn7uwRnPoeCDhIDwvNkK+x
+h4xmjH0970v1ltbzcZv0wnK6UeHQssqN9NGsXM9rbodYRIam4yxbwd1ddOC9QZFM
+ToRVWiqCzGOVYL50a24OYKClGjm4ncRznXJrNwYMEjxQ3j5FOkXIn0096z3szWCY
+6yDpPzOsl2TPwdjMKZWoMEDh/SvY3AxAXo1XqDCj2/+C8dDwO7kn+QAl3fUGmkI6
+dUHCAJm/WtSyvINdphzhZ1ZdkPhqDUKcR0JTX03QJ6bnu5vmmOncWm2NA7rP74fq
+KE9XzT808xP0GBwR1co7Eq+/751j2TA33JSlt/hIgi5aEWc4laCingJ02yaW8tUS
+DCoVNITaXcF/B47hjBgovQk8TOTsQ0nkSYvOoh05OYBmzl17G57QuPx1stRJ29QA
+VLGem1v1mXAuNdHH0kNE+/Rv0A2vGqauLx9ba84RfbXMM4SJw8CjhX6OxhAM8xoU
+tO6T56XZS8qLtWLkNQNZNdNlAo6tYk/cTrjdX1M63nYjoVbuc0nic6Wp+dQk/DEb
+wsiIpFoisvMK6EH49v70/c9Gtg6rk5z2yBHMZsjo2Y0TheTKwKIUEz0MuTncH8jD
+yB/NtQkrbiBdEqRJUoKKUtS0B4cUYTUyd+SJAhwEEAEKAAYFAlSn8agACgkQ8Ar2
+6sJF0gs2yA//cgc+g1wPRFzJeQGv5UFR3TCAMtS+/bzY3UU/eG2Jmbv2qwPbn+kx
+RH5dYlZ72VHXEggBaEweCBrBWsweX5dGEMNDLNlI9ArAjjhBAZFFUQKj55EzIZpp
+YTbvgxOD2ENKU2HfeQYCGFYZr3L2DXQ1k0U7VnaElBQV3o88CMi7bIsQq2aWk+c6
+Cy15UVr0niVLm95EUZM4yYm2gOGJXUeaGIExSBtiwuzvAiDEGaqfPGAi1ePkNmLJ
+3UzYfgiQumSh1kDVlQkCc8UQiF6ckEma618cmmaHs5vZvHsTX5O2/qPkLpXunA/7
+5yM/Jde8a5VbNGWyZ4rmstlWR5rPd7r3uP85miHn7Arait3aGo8RQeAHzOdTvMqS
+n3oCotQlOvBhOo7qA8oYQVlU0+77gOfZZeEXDZG13lU95ptFhdsGstIQH67jPQ6z
+TpVnd28ip92ysrwvxPhOzO74yKcYoKtzwLctcvptlKTkrFMHP3wJwqbaSfJGK4JE
+rjT8WnnWyHY465nTDN9AKkoH4WQNozniWX8OkF3CpPj7ow8roFXlPOxXH4QsaQu3
+Kk31APn/A925d4xyYuWYHZ7A/FzsHafFHPMoG3iwZyuFhfl1UXVvEd8w9mEcxXoh
+2iCy87TdpesG0GDzSmWwEYEPkg20BD2+vdc0EekALDjAGM+lfBxN67KIRgQQEQIA
+BgUCVKgM0gAKCRAJp6JK0eWCB94UAJ98O6S6r1hFnCLrbU3GeqrA4DCtBQCfcza/
+WoVLc3/+bOf1jzjJ/eJ20IyJAiIEEwEKAAwFAlSoCRMFgweGH4AACgkQhS2G+DXA
+JIrWURAAvgl1LkqB9pRPViK1U+xa3b5zt0O/fLbov59aLhA4uPJ10BgaKptflLim
+aE2EsS4Mnk0DQgGEBjlywJ5Ft3aMk3vbRz7lDE3zQ3oWa7+N4fcG7WWsAxmh0NtX
+Ak7orN6rQcyGgWgpF7wOau79i4VO7oLHKeS7QNs7X59CW+k64TAJabxi74PRoVMz
+843qWPjsuFIYM7n/nF0vdECwhSE8zUgcYG2n5CdA0Lq7XRE+II11VOT2XEXFMyR/
+Qh2m7l+jy12MEzHQfGC1HYBo/Zi/MRIN53Rd2LLJWQdMxz/BDiuSxZhKVeCRe7gT
+Mc2k3VrmfViBoaUE0zqMbx0j29XUbNQNU3afE8MOBkmyd6AQjoswBEsgU9uyCJYD
+Jq3V1stwSVBm9G7X/l8GFlPawLg/uM9gTYb2JYUYPlphTAwVcL469rKQNMhPj2ww
+zT7NzjwFb9XrmyiIrqH5z2ieG+LRjajOPVPwBsqZ3gOA+z9QkU1lRYEJOTlEYCkv
+8oA6ZeFm31S4JoeogbCDaMiqDszkFtYGBUgGEbnHoCgXi7aINSb17VZ8LTzpD4V9
+vGdFVuE3vJf2POMERP+buLV8OiG38cBJXb+JVSC+pkpm+32nY0UR5ccDPwAC3cGq
+SbI6ftKlQeaYp3UEncFUaB8NNZings3jzRexPjzUzo0vhRkkIs2InAQQAQIABgUC
+VKg5iQAKCRBfHshviAyeVbEVBACL9Vve0dF0UqO+DN4PzrTOx2JzRw7ujhcrZ6I/
+TCXjANGLWUheylRWhvxMojvbhZEg2835+9l6tpD7BVnrfkBE+LYIKFTusye+WYre
+dAaHFpuN6XfmsXmhXaSodhH9gKS+oftYX61qUmiE7L98nvINNBMnFVkptCQVDl8o
+GWiMRYhGBBMRAgAGBQJUqBAmAAoJEMSxB5iFeWojCtoAoLa2/SUyfC5EiKdvEbap
+49v6XPyxAJ9mPvhe75aTOU7uWoa+c0wn6fXIcrkBDQRUpeK0AQgA7ctg3cJD4eTw
+j4sQ94AtSYjwT+Yp7r2s6h4cHUge6AMZy9ixtyg87JnviRFob2zeo2JFDAwtl7Zs
+GHo+py/mJwfQKmUsXUmQqgHJFXDiiux+4+dYOXZyVYKP5bTV0JVlKjRjSWNnh7Bv
+yZNUZlrLz5ZKF1NAYKJAw4fx3TFbC4K3hvDwHQW3croPQYq0wNq6as956LHYjUOB
+Q5K0uy4TXY2EcIyAy253UX9MAFgacuP1jf3ITEVZpcebzl+gcaB54gXqOfmgQQP5
+PmQDyb96ZxFsKa5UfsS3Kh0PeERa5TDlgiw55O55pUSGKKfYfOXvqpJ/ZKYl+ado
+wgsmbq09UwARAQABiQEfBBgBAgAJBQJUpeK0AhsMAAoJEKr1td4FvcxTNO0IAJ2b
+V48mulcdCS8G3t8qRHlEXGbxgYBQRa500M9fdgRyIWBxubP7r6/nLFDGiIpdUVmT
+g9F3r1JsyK6Q7+VUp9XLirj/gT1kwxXT/UHHIQO8ObtPbfFtqISaBjaklTOUPCud
++nOpzRIfct6CZM0xAVIoqm4kaRFaWefxRiyeosDQ7tCD4lDRwxNJE2deE1WmOeN1
+YCJHa8QaewJXtUvqMq6pRmTlzSn+5/w3gV3XVF+CHjGD/COeSm7CGazLmlypN4n8
+ib9eRg0K2rAqKfUbn+aFwmqSBhBcw/UhOoXnteNQvd9KNdKiHERJEI3qZ2rLAlYf
+uYT6oSAR9rPSpsZpyTI=
+=Jib4
+-----END PGP PUBLIC KEY BLOCK-----
+
+
Type Bits KeyID Created Expires Algorithm Use
+pub 2048 E2763A73 2014-01-02 ------- RSA Sign & Encrypt
+fingerprint: 49F6 A8BE 8473 3949 5191 6F3B 61DE 11EC E276 3A73
+uid Sendmail Signing Key/2014 <sendmail at Sendmail.ORG>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQENBFLGB58BCADFOlIYbhlAZ1URaoyfEHLgrm/bHeZufZO3jp2eeuDIkt4Z8csa
+eLkwomo/UtmUNXkn5rlUacRjyuhrDgVyuhYVeqq+tVbGccrjq4TM+5dkDTtQvLE5
+sEF3pbNYiPNJwPnqMfGTVmSouR9gGJGgttPubFDp/2jTpuFYZbcDSo+hoI9m5RAH
+aWe+MhFC0r7RZTv5pY1CG3GSODaoz2XIQ/dDJ4WKZFeEvDPQnpLY4t0cb0hVcxYO
+XVZZs1YmS2sEJirwJ+rpxivX4eyVKSO9Vjidh6cvmg2UdKfNoXXd+G9r0DR5FSo7
+hQHlOCrLFQQ5YJ3thGNl/fw7wVXVs34Nj7QfABEBAAG0MVNlbmRtYWlsIFNpZ25p
+bmcgS2V5LzIwMTQgPHNlbmRtYWlsQFNlbmRtYWlsLk9SRz6JATgEEwECACIFAlLG
+B58CGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEGHeEezidjpzcRgIAJUZ
+4J6yvykcpgrIS8ZjDz1ab2sXtBx0ZjI5TxxnIwg9RQb5YkEk2/9tPo0ZwNUTDwz6
+eVENR++Bv3VXs32RnRiFNy1Mm2hhULh4ifgqT6Sy7zRk/kwiKuj6xkjAGZV71QmD
+ukFIpVaWAQwiFkDgqM3LbxZ1sisbvvA8M/zJq66uGg09Lu9CKcwjKDfy+UW1E8Ub
+SRzStTRrpvCH400q/Pwv3mOA43+H6Un4fZfCOcZeo22rSgT6D/FEY4LMdNnMLYuU
+zPkpx7cKvQa/AcMdjoGu38g364JxlDjxjE6M+XBym8Tx6j4res7o0W8TGW5g+rEv
+8X9i7uxdnEfYBlNAElGJARwEEAECAAYFAlLGCCIACgkQPWiyXVIHytM4QggAtF+W
+cXu8pJi3+OAoPmj+etgIuLhJ2GOp8qNK8yvwTEwiNwtenjennlW3ETHiCbtfQ0/T
+Z9rq5elhANsfp8LsXGoJ4ic6KJlDEhCrKa76jwEeECI74E60TpG0z64pHMmUhk7l
+eAUckCOvW7iHIBJVA7ZM8oII04ipPz6qJfJrUWkJbfZh8VV5DRp7zKAFT+URgSUc
+bdAbLjyC7AohynNVxir90UoT+wo06GPMDpeA5+fS0VZxKAwKv2P0mRZAK63yzEJz
++VK3GCHLPCWJvHoqx4KSutk2mIpZ406T/BJEphkGN0BHHiUmIr9qfX/87klA4i9K
+dHvzFr6qFBxD78XfuIkBHAQQAQIABgUCUsYIMAAKCRCOWun7zu70Ox9XB/9IP99U
+LScSFiDgoZQr3eMztpc2NLIS2bGO1iX7L+9VInPCob7Se53MpaFrDWNna53Xehwf
+NbaqsCQrG+OIMMwhRc0x3QCoXQUchA/JyAUIojfOyoFUZvlyZStRGOp2TBRrJnmb
+l3iWz3pStqqtvqag2d3YxowqGqUvlRzAXTFmgjcnfMcJrxb9f3n6Nf84QpxLHxB2
+MgOgxUCHXMtJ4WxFHAoINize+P/P99U9mpyn4ewTnSaFzcmemqoVT9yZUDYUYrap
+Bm4Xp0Y92IzoNpJgKBZLwXihisuI4alY/hBopo5L89vms2BwesQuh/4Tr6SELwFx
+zX63E++tz1TqHleWiQEcBBABAgAGBQJSxghsAAoJEDmkx32peISwXiIH/3suKuiQ
++KqQT10UdBoNg6m0XinG4IG2MghRRcdg2Q8ncCfMFJPsKQcPdjiUuuUIYtD7CE+O
+SwQ9N+6vZlsk3Zq2I8rPEwrUTmZ1gDcMK93MafNS32Xt7FmCY6wpMCkpmCLd9sjb
+7rj3uZdv/aI6Is76z6dKTfxJWBrbsUQNncASn5JyCXrYj9eeGP8gHX2KCkyPBF4u
+kHFPgdzYevCfZeP/+f/cdRwF6bAVaHiEZ2S/Vg6r3Z89vgd+wNKnNsljEiacYWuS
+zxouEn0eWQj9kC3bXJgqXH+HLrEY8NAQ5EQWjd8bzIhzCTA9MtL+N1b0Ep36gNiw
+YFB5b/b7KlbEPsSJARwEEAECAAYFAlLGCG8ACgkQYE378oVBCr4XDAf/auf1ljzq
+w2khe1L/1ANvtnugMP3sVJEPU2nDUnCK2+c0G5INnWc+c7DEFsaLHgcs2eN/w80a
+adInDn9lFw7DtcvZr3xL8q+b6j4i4jucjT5WVfYHbvc0xcKfpEjRge4oV3XR73SU
+ztdTWZZAlds4Xvh9pojjM90fBu5uDqfpRM3/vNTQ9EWvjcCGKusWRTwgdfF94cHN
+CeSe8PCo7sil6MtBBoujmLldCKZaLC08NLPX3yTGzNmuLyNZj9WgwPoK++XTxJly
+0j9EJsO28ZxmNCxsZyGA+1D1NuRurQ5FXIUHUfz6taP8FHSDt95cOiirmCMOAjT4
+UFtGAZFlbhzxroicBBABAgAGBQJSxghyAAoJEBKJbpunfyQpyFwD/1fp8qgb6zvn
+dIoTUoVWahI41Clt65cA2d1Ib1IbJJ4ms9cxNbFMTvbpPQ4AXOz1t7x2uS3YDmq5
+IxdWLr6YPSMkGmtpF2CD1HwSLcUwtKcIFrb8a0EN8Z+sRKu7yYg1vMxc7LmmOBUX
+x+j9fm/1OFGIHYnUEb9GeKFf91cK0VAIiJwEEAECAAYFAlLGCHUACgkQ2Krwyvaz
+BylxvAP+JuZQFPnk6l4SKHR/3ZWz56fOqZ6Qv8cgUCFY5AY9OdSE7aU2zVjZTjd1
+dJzVD7xc/9h8OW4HakfwcNnfAqdQ4eNdox5+uydXwU0CXJqU8QxGPaCSRkB1Thb5
+aMik5S01lzra4s6dF0iMC15I5v0PAznykJO9Sq4qhMLUCYTxFiqInAQQAQIABgUC
+UsYIeAAKCRCXQwEYcJO4QeDXBAC2hVO1j2dyQfkHr8eLAg/P+2qwZ1ZaG4jxItol
+vF91lfGNCaG3RWB9iPRIkz5B+lSoh4mSPGzJ3cFDgB53rRMpFUa0qhiUpVaNuPMY
+BSrkxYb00amJcFoXX+yE8soeu6BZ1cazg8GEkbjFbboqJMts2M39dD3c4ikbU4Op
+v9ag1YicBBABAgAGBQJSxgh7AAoJEB57s8ivlZYl1w0D/1AySnzhz5PKQo4Wh9QX
+qX+yMVBT3rgVO6EgR8ShsyMhZX8GwEEGPueDAh8MLGPqQZbjXq81QMeVk6TSUCQx
+XbhHxyGJJTVDxxJxFJZ7f8y05PjppTA6TL2aKYsZLkWUPEq5vKocE2VAmYldwvRS
+Ez4oNLWQD5dw05DPzVsJ2/49iJwEEAECAAYFAlLGCH4ACgkQcKAkTR75klFOVwP/
+fxmc8/ckreAjz7C3oarAHlWgAUHrJAAtG1MEgXN6FtzGZyzj7jsC4HI8A5nfwIWx
+A67jktU+6OpySrvIv3gRF1OAV168Q9IE8KszvnJgl6Gknf/KuiwpthWHpKztn9lF
+vealu7JKqI+3D5m33SqcWUg8SThfnGBoZOZGOnGrw4aInAQQAQIABgUCUsYIggAK
+CRDI1e0plfYXcf9oA/44QISEfFkqab+NIIgKW0SHqJDmI5QvVkcCO1Ct+/TkhGVO
+I68XKLMaNbzerl+BF26gU2IYCs0axa9hlkl8IJLokZhEPSRPDuSP2PG3GjaFsgnE
+5OK6aaVvjrEwaXe8v6rOYLmavnhZtOKg3H8pOl74KhFy1i/ZwM9oVfD4sfLhxIic
+BBABAgAGBQJSxgiFAAoJECGD4bE5bweJnYsEAJUX07KH5tI+OfmhQ+WCFuU2as+r
+I39oH1BB0W44fEhTj/yJFVqGSt4e3OBlP+SYqIM4DxPttxNtfQ9448rbzWLCdL0c
+KGOM2y9NT/LoDi1JQ/IVLYvuIyNnPViAF5JQ96NrmJH+3SaC6goK6HY6D2Oh3iyO
+1VGIhjOWyJr2+5ZjiJwEEAECAAYFAlLGCIwACgkQiWliuGeMCgNvkwQAjrrAjFyh
+pMepbLnRlxi2gcLqdmLcaub6AaRzCGDaYQxNFtBd+vLt0CtgY7sILahcMX6hLT53
+z4zCHoM93DM3jBoJehC0lH6/qd3ZAcW9vcSxk5ws97K6sbMXWIfqDgTUXaArOvKG
+GHE3vsgaLvAQ8nz0QaVkwgSIQfz+vBDjlM6InAQQAQIABgUCUsYIjwAKCRA4IttH
+zDdPLdPdBACoapJIpeNLyL9szztPzznIIxNbeuFJVfJRAE+pZ08y5YKVtGWArUcb
+GBXlZC5FrVTqV3ptIa72ALApIZ/M4Awnk3C3XyjMioKemv7I+cOj5DqRgkR/hsAF
+7YSAg718twgv8W2Ssy8i2vOlAoazxzN9bhVl5cSny5aeUnpLwK0WMYicBBABAgAG
+BQJSxgiSAAoJEJwcveLjXFY1DnoD/iFZ3zhzwIyWUl17pESa7H79tbcpmRyelH5M
+vH51sEBl27yRRKrsx4oayaumUT7W4JVoQTEYH54unN6fSBqKK9VyxzlA+v8PJjTG
+43MhtMG5lc5B1fKXFer1SpxuoR5h3Qdi4KSz3yh8K8g5KKtciPBx5kEXSTm6Nycu
+wkrCRYZLiJwEEAECAAYFAlLGCJcACgkQb1KT2KObplUY2QP/T2Zt5U2cl0usnYck
+wmMF3ZAzmcfhsxMkVgxxL9AkVJh9dHhLSYFWN6qhlkZwiW6UhhKoINfEpb8gOcBz
+rdb4u8yrWqIS726GqE/gnjYUf5CX22mOPWry8CPuWesRVpr832TzS5wxlBQzRMSS
+MVn39IPfIQnC6UQ3tPChruwwZh2InAQQAQIABgUCUsYImgAKCRDvWJZk1DLhnUOZ
+A/4qp/HD/+V1zpewexP4wL+bLA9Y6X+y2UWAh7eZCBQvXOhVAYcHxpmWgEfHuS+c
+iHYqCc7hz+1AiKV8AfVk6RX0k9Oli/IMbM3ijv3uIl+5JF765oXUAB3RWg6V+MlJ
+VhOVkBHXmBuhFnfVPeR5wNPpQ58d9LwsZtU11/Y76xzOUYicBBABAgAGBQJSxgie
+AAoJEMGcHSUS00YdL7MEAK/BtyOdoFA/8SBA+8EOG8nd5NSlGNZUBnTlpWqdphkR
+SLRrb1gLGr41ND2yvg/ElTti7m1D7+7VUnwCXM5wUO/RZuZx2uDYRCdDXj5WBhcg
+3wsHO3IPGGTbCukp9fLcthBQ46PDewlUVo6gPWhjWG/oC04XYeB3+f1f1zGAai+s
+iJwEEAECAAYFAlLGCKMACgkQwCnKQBb0zOm0CAQAhwRycBvn1kZB8cjBVw0a74Xu
+rjQrMVqmKM0LW/UzoVscB0W2KxZnvCLcw8N87CnnoSAO3MSnb/vPPhtnQxVe0IBA
+4yoe9acWJvmtIjw4JFDKioVPtEy+pcg5EDlyqNHj0He/Cmbirxbvy2XiGB/Y/lxu
+t1kad5ZYY/F5+X4hbyOIRgQQEQIABgUCUsYIsQAKCRAY9QOAJMJ4ArQbAJ414QQw
+60cTU3tVbBTT/l/sRysTXACg1ggZJszRL0P8Yy6WOryQ+r5Fg8yInAQQAQIABgUC
+UsYItwAKCRB8S2dtoA4VY3VvA/4i7bKzYElfVdTIj0IgHfd1zneeDjJoJP5tmf7F
+ElWIkENFVkKQ+tUBO2d/qMK8h+aj3brDcve5A1LUIsD5leE+igke8SjVF9/fwN4U
+8Mpqrvaw+CX7zGMnt6J075OD7mfU7hZkSpDhmOEMaEzaviei2rovBgaNv7tOlgrk
+J5nCo4icBBABAgAGBQJSxgi8AAoJENbgof5PvirdqiMEAKp3kzOjTetlDWAqK0BY
+u1kSTCLzO8jFIq620dT0BqorZ5nvxwKovog/FgrZ0LlywsjlwOGCAFo3aW7WTEyt
+7AwlQvUScAbPuZZcyZxKwQ9h2O6C2K2RPVIIHQusLRVcr+oGgqMoNjpSxOOxfJuj
+hT6fXHK5SayZSQEiZyeKme12iEYEEBECAAYFAlLGCMEACgkQIfnFvPdqm/UiSwCf
+d7Y5AR2m6vK5drJEaqbnv2tmXzcAoMhOg7eUPnYXr0Uwpo/61oHAPUTwiJwEEAEC
+AAYFAlLGCMcACgkQvdqP1j/qff1p6QP/TkEC+SJr4YUPy/0cLsSr9j0uPfvke+Qx
+U0RWynv4BMU05TKaBeZiVG25iFsGERW0drxiisPkcgMTq98wE7Q23Qtk+Fg8amDn
+6c0qEj0S4xd/DfHPhcznHjjkhiTftSmeMGHDMF8M5+ZBSlJyM6M1dtTlceU88ZYu
+Vv89Iz9nnmaJARwEEAECAAYFAlLGCMsACgkQvSdtLm/PqIVOHwgAvKy116ykGuvC
+LlxCVx+RfIjhaXa5OTtZhLc7YkXgaNr4UmcvNZtGwQLUEjDO4fVCF/7bSrryZ6Fr
+PZBNTKQRwbqH8UksQ+6hIbTBb5ZGcpKQPdIqEWjRjCoDah2EI1ln/JI8WY5NoA+V
+iuBd07msr49qevHgGEex5dX7NKOu6nuvefaasVDODNsiMp2QZmIlP7XJw7VKkiEx
+ov93DGImxD4o8r2Etzo1Lt5/soNzw26etSRFhoGHRdW2mlS5QFjebV+PNAxwvRrI
+a+5CjoA/vFfwxV+RZlvCLhzuEsBIzw6yenfNEd37bzqJq/7Jp7kQCe463o7ujG00
+k+ObGvq/YokBNwQTAQIAIQIbAwIeAQIXgAUCUsYZQgYLCQgHAwIGFQgCCQoLAxYC
+AQAKCRBh3hHs4nY6c/AjB/4rt17ezRHDxuDuS7+waPC9N6eXAQCbwdvkYd/v0bWe
+5jHgknMHR9OyGU9JKA4boJCtJNUvceAmzBtynqxy4hR6rmCwCmFW3AIK31iu3frz
+Zqq84XK791voKMMrvnux0OHqq2l2mYOSNXUeVNQeyDE6HbKXFUiWhRZl36UndVaE
+XhdDnKpxseMpYZsECW1+x1GxbUHFRx6tSiqzgLSNU/SsgwgttHwyqEdW0sr63r66
+7XSoMKvEgIhb36hJ7AIaFNWasLnnLOTOWR74IHnJ68FpordYm7lnmT5Vg/ju9y29
+JDwfOcNroCao6tTjyXcM6KmIssQPavTDLK/I6XgVr9QziQEcBBABAgAGBQJSxwGo
+AAoJEBCQryClqlvmWGgH/3CsqpTEKQW3FL/jughz3Yt8vmgqmlj7ZbTaVehIKRU4
+iL2XOlgAu3JISxCLPkdz79qcMSkZsOJtTGwA1yjvw/yx7oSznvW+jgNZ+fNOuT9w
+c6YKGSm0KbGGOFzjzoCsnIpoVEVuJwOS/zqGY349WR5dyaY4pEL42StfqLLtHO7I
+IJMKRcubedgZSogT9iwhin+sAGi60Wjq0pX240UQG0bgSB7n+/+7NT64u9yRyPwZ
+9B7Y11smlCw0jIlJD/P51rFgFciG/BdYyPfRHToe5CjOI+1sFxJYuOQI25o9/Syg
+7MMzp3ym2IEjIi3poBwfqZRlPDb5nHfu4vnSntPrwcWJAhwEEAEKAAYFAlLHCkcA
+CgkQ8Ar26sJF0gu9AA/9EXGIp5BwAYXNtlrI66nuPBwbPXHIVXocnlu2O2Kfzc9W
+Lvl3e5eSi61/TCOPNM4ParKUT9utxq9Sd01WO4GuepQFOiSfhMfKb7ORd0cKfWuM
+9shAKHsTbuAopO9R43jv1QnE+yL1xpM85JaGxI2pWf4XIpL32ZZ0s7s3x1fklNMG
+7ObB5dHr66M/V/GXZSx6rTBWhODm34W07HcXqDdwjVT8J/fo+3kkY9eXYuVfpl8t
+bVV6g8DK1zMkQiQBHpN0DCZUYB9WoJgCKFsTvVUElRyMY5sd2bkyAktA2df1EBSH
+kMXzqn3py+n3YzRY3VpsNUV3WkDRfU9SIdJd8g88muZeL9namSr/3eHTjdaMoCyL
+GyyUpy5LrD56k3QWeXDWVynU9lXuxaiJDntP6A81d6vaIBtm8AFVihtJFoufHot4
+crmPqKtH+MQ9G6xwN5Az9okXKg7HGG9ZD82s4D/X5plN0OH5pMeYLrOQI+oEhjn2
+uK67y0Zl/eqoQcnVDy9PFrynuSVBC5/BTGNbebQrTDrIsQo0m0LMYO3mUzMBA7SO
+j9iA0vmXxIGsPzf8lRu26odcahKWswRE492MZiTJlul+HWYmun1b0XJz/4YDWL5l
++kUVLnl53o2aHVlTkmPEMg/mwufkxTayJrtl3kL6oun7e6jUjaCRao9eLFZWtGWI
+mwQQAQIABgUCUscuQwAKCRBfHshviAyeVYy3A/ig6XKOyU+RC/+4HtFxvL5osE9T
+w/9JlY78umlNish7CJo0Sbka4nFipd6Iw/xcYiAQ06TuS5NDwdmcuoZoUpDAqbLP
+r/pWpBy9IAUIzAa1UnyvYTDBp2NS3nxcWnzEpXk/dDyYMKX0gUsrDjE9ZTpsKeMq
+70Kgq7lPtH6EfekmiQIcBBABAgAGBQJSx12BAAoJEG8PnXiV/JnUMB4QAJu5xu2F
+ej5QSiIXlZw8LD/uzx3UEQocQy4eGPtwTxeYogt9FtbdblRYb6Y8qc+Uyk6fLBxB
+E+gclk3I2GnKnpqjtdG5utJnAbvynqfgoE81tuC7hjxKYPaqGTJotwX4IsV8MZZN
+D6hduw1hxCWsnckS/6jnVrJxThKqlKEnnFqLE14W1WTnKIqh+dXYdnqn+MEMXZhK
+7z68TLteASvT1S9i91Kof7gmfe6hL2wbzPAtils6+gJr0ZfxxUTDzFL5hFulypzX
+GgW4VemsZLRz6hhevPiWSRIGCG6xO/boGPnlOQt6Fv2mReBiuIidSia9S1G7G8KF
+36ya41RrS6157dgAeSGGUOAzGkvamqlJozlTo1dl8eD08x5G2cHKL/H2oviaE1hr
+CgZypLuhPisW2Yd99WMndMV+jrbkNXcORVdYQO/T0aP0vA7zNrTv96shcpNoT3q7
+nWDuGvxjOic8sSX/MxR7F+4UqZO9eZGziPnKDrv1fp17CWWmBBvJHWhFXfPF9nPu
+vej6q3Eq49pq3oDuIbtV+1GaMKLre1fzMzqyz1hQ+esByOKi/cAH+QzkbXUC4KyL
+q45O/UfNR3hYZms36n05729qF+hW6tO2ZGd43k7kSVgYHj55BIr942dzWMvg7BUY
+aWQqYiahIfDxfBXz+WvW5gihr8In24L6dYXDiEYEEBECAAYFAlLHhgUACgkQCaei
+StHlggeAhgCdG3L6GRFUho2VtUOx+uaGsvj7vvUAoIahAtf5fb8mSfzceNr5neXd
+FgnpiEYEEBECAAYFAlLINaMACgkQxLEHmIV5aiNLbgCgoJYeWDcldLWYU1MH+uvo
+Ll4ThV0An0PZNMtCd6gwGGhGd9iMRqHzVpQQiQIcBBABCAAGBQJSyoYqAAoJEIvo
+ebAocx4cLO8P/jO9GWX7PSI+k21P4NIjSc6VHYv8MMa5H36NWe8wnoUSUr8FKvUh
+uLOI1bDamRZBdCWSuMf3gcWNiwVi3FKJqH/tAdjD4Mc9NaL2DJwKgHH3IlSwV+jF
+Hz9OvkEzfo8RT0zVkbt61tMhrNCK7wRw/QrjchixNyJH9YIifV2huppwbgHl5YH7
+7wYJ1thhIgyw8kSSKHFi3yJzy2q1qZ6hwcCCkUw2K9VgYV+0Y2plSkkc/OsoBUsU
+JSNdCOSAzpwAmFuSpT3YVlwWnknJu0vV5BPUL/dJTeYLbhyxfXWiWDiF1tiBWHMS
+KvUJowbW9r2CZ/FQx4V5hXKMfCupuDJpmCvIiDfRPGfuD4+4vJ+EhAp2TEyRL3HX
+7BAlQ/95TiS22AhcFqn7Zl+9tS1vUcj4xLmakPQ2REKgBqiUrVDu+GvzZY0A6V6k
+J6LNc+ncaLX+B9lYqqMQmxLyRK3JySpHWgC2ZPoyje8GR4ksf0IlvrRufFMj1Qyt
+/a8Jc1Z2mXJR3PRrsL7EBDdp7Xl8BGqnjShZgIvKPDt6+nCIqsv13OjWaUBl+CKg
+eZcDMt2nZGUfu4KJD6ktJ9nvthrocWxL4dRhFM7s/R9ad1IdmySoBH9SnUuMgM8e
+bKQ5FnVqNiy1Z+JrsigPvb671KJ1MA9n2rPaBhY1cNYaaavIbKkBzDDTuQENBFLG
+B58BCACe6UEcbxy5q6rIPXZikT4WCg6bw3AtdT/MeLUCmxWhhP9g+T3i0t7zU6bu
+Zcw1uFxjnKsMEeDBHwdI0Bg9r5EVtp77GVf1EGrveKvISURlktkBtcezTVRfukEM
+mTXBt/3vMGLg+AadFGZTU2ciKdO22AxLBZWVgz0ICoO/ljtvEFokrrzwDoF6ySHX
+3Taiq/aMqI/RjIRXXMq6u+/oVC6droj10eZRYXGPMl7og5MRSUU8waV2fYgtfLmw
+BtVEFbd0LPO5L1BNgIIMBx1X/QzMeBTldT+XcDSYh9ELfMJoynnVz0smZbeQ2PZ/
+DhGsVsLvJc+cx5cDnBKsPrejCTXBABEBAAGJAR8EGAECAAkFAlLGB58CGwwACgkQ
+Yd4R7OJ2OnMzXAf+LxzrPplcEyIDKOoGW21320AwH5NqjInqj49K0gGhOL/xNkfs
+C1wsiFFESdN7eL1+aDdk68CF1ClJagDKkH3U5o5PiPSjCsGBoGpdI6f7mRlxbUT2
+jQv0QC9Qav+9t4QcyBC/1BvwO1e7fgrpFLvBrXJpj4utHBP/R3WUo04kAp+sPbVk
+tOEByvXAHkDDe0KAG2G9A0dLqF7kfydoSaioFmoJlkAu7LCwFLFbFZ3JRFAaYEQO
+DfwkgPDDOA6k9Y1o+nbk/TgyEj7PtpzkiWh0aK5BRI8mjA/s0XNZKpuY1sghyASo
+XvRQkAGPLcqS1D4k+kW3MLWpxjbSwGi8FCdsfg==
+=d3FT
+-----END PGP PUBLIC KEY BLOCK-----
+
+Type Bits KeyID Created Expires Algorithm Use
pub 2048 5207CAD3 2013-01-02 ------- RSA Sign & Encrypt
fingerprint: B87D 4569 86F1 9484 07E5 CCB4 3D68 B25D 5207 CAD3
uid Sendmail Signing Key/2013 <sendmail at Sendmail.ORG>
@@ -2435,4 +2792,3 @@
=nES8
-----END PGP PUBLIC KEY BLOCK-----
-$Revision: 1.1.1.8 $, Last updated $Date: 2013-08-14 22:35:47 $
Modified: stable/0.8/contrib/sendmail/README
===================================================================
--- stable/0.8/contrib/sendmail/README 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/README 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,7 +1,7 @@
SENDMAIL RELEASE 8
-This directory has the latest sendmail(TM) software from Sendmail, Inc.
+This directory has the latest sendmail(TM) software from Proofpoint, Inc.
Report any bugs to sendmail-bugs-YYYY at support.sendmail.org
where YYYY is the current year, e.g., 2005.
@@ -37,7 +37,7 @@
4. Read cf/README.
-Sendmail is a trademark of Sendmail, Inc.
+Sendmail is a trademark of Proofpoint, Inc.
US Patent Numbers 6865671, 6986037.
+-----------------------+
@@ -211,29 +211,11 @@
+--------------+
There are several related RFCs that you may wish to read -- they are
-available via anonymous FTP to several sites. For a list of the
-primary repositories see:
+available from several sites, see
- http://www.isi.edu/in-notes/rfc-retrieval.txt
-
-They are also online at:
-
+ http://www.rfc-editor.org/
http://www.ietf.org/
-They can also be retrieved via electronic mail by sending
-email to one of:
-
- mail-server at nisc.sri.com
- Put "send rfcNNN" in message body
- nis-info at nis.nsf.net
- Put "send RFCnnn.TXT-1" in message body
- sendrfc at jvnc.net
- Put "RFCnnn" as Subject: line
-
-For further instructions see:
-
- http://www.isi.edu/in-notes/rfc-editor/rfc-info
-
Important RFCs for electronic mail are:
RFC821 SMTP protocol
@@ -465,4 +447,4 @@
test Some test scripts (currently only for compilation aids).
vacation Source for the vacation program. NOT PART OF SENDMAIL!
-$Revision: 1.1.1.5 $, Last updated $Date: 2010-01-10 20:14:36 $
+$Revision: 8.96 $, Last updated $Date: 2013-11-22 20:51:01 $
Modified: stable/0.8/contrib/sendmail/RELEASE_NOTES
===================================================================
--- stable/0.8/contrib/sendmail/RELEASE_NOTES 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/RELEASE_NOTES 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,4 @@
SENDMAIL RELEASE NOTES
- $Id: RELEASE_NOTES,v 1.1.1.9 2013-08-14 22:35:47 laffer1 Exp $
This listing shows the version of the sendmail binary, the version
@@ -6,6 +5,222 @@
of the sendmail configuration files, the date of release, and a
summary of the changes in that release.
+8.15.2/8.15.2 2015/07/03
+ If FEATURE(`nopercenthack') is used then some bogus input triggered
+ a recursion which was caught and logged as
+ SYSERR: rewrite: excessive recursion (max 50) ...
+ Fix based on patch from Ondrej Holas.
+ DHParameters now by default uses an included 2048 bit prime.
+ The value 'none' previously caused a log entry claiming
+ there was an error "cannot read or set DH parameters".
+ Also note that this option applies to the server side only.
+ The U= mailer field didn't accept group names containing hyphens,
+ underbars, or periods. Based on patch from David Gwynne
+ of the University of Queensland.
+ CONFIG: Allow connections from IPv6:0:0:0:0:0:0:0:1 to relay again.
+ Patch from Lars-Johan Liman of Netnod Internet Exchange.
+ CONFIG: New option UseCompressedIPv6Addresses to select between
+ compressed and uncompressed IPv6 addresses. The default
+ value depends on the compile-time option IPV6_FULL:
+ For 1 the default is False, for 0 it is True, thus
+ preserving the current behaviour. Based on patch from
+ John Beck of Oracle.
+ CONFIG: Account for IPv6 localhost addresses in
+ FEATURE(`block_bad_helo'). Suggested by Andrey Chernov
+ from FreeBSD and Robert Scheck from the Fedora Project.
+ CONFIG: Account for IPv6 localhost addresses in check_mail ruleset.
+ LIBMILTER: Deal with more invalid protocol data to avoid potential
+ crashes. Problem noted by Dimitri Kirchner.
+ LIBMILTER: Allow a milter to specify an empty macro list ("", not
+ NULL) in smfi_setsymlist() so no macro is sent for the
+ selected stage.
+ MAKEMAP: A change to check TrustedUser in fewer cases which was
+ made in 2013 caused a potential regression when makemap
+ was run as root (which should not be done anyway).
+ Note: sendmail often contains options "For Future Releases"
+ (prefix _FFR_) which might be enabled in a subsequent
+ version or might simply be removed as they turned out not
+ to be really useful. These features are usually not
+ documented but if they are, then the required (FFR)
+ options are listed in
+ - doc/op/op.* for rulesets and macros,
+ - cf/README for mc/cf options.
+
+8.15.1/8.15.1 2014/12/06
+ SECURITY: Properly set the close-on-exec flag for file descriptors
+ (except stdin, stdout, and stderr) before executing mailers.
+ If header rewriting fails due to a temporary map lookup failure,
+ queue the mail for later retry instead of sending it
+ without rewriting the header. Note: this is done
+ while the mail is being sent and hence the transaction
+ is aborted, which only works for SMTP/LMTP mailers
+ hence the handling of temporary map failures is
+ suppressed for other mailers. SMTP/LMTP servers may
+ complain about aborted transactions when this problem
+ occurs.
+ See also "DNS Lookups" in sendmail/TUNING.
+ Incompatible Change: Use uncompressed IPv6 addresses by default,
+ i.e., they will not contain "::". For example,
+ instead of ::1 it will be 0:0:0:0:0:0:0:1. This
+ permits a zero subnet to have a more specific match,
+ such as different map entries for IPv6:0:0 vs IPv6:0.
+ This change requires that configuration data
+ (including maps, files, classes, custom ruleset,
+ etc) must use the same format, so make certain such
+ configuration data is updated before using 8.15.
+ As a very simple check search for patterns like
+ 'IPv6:[0-9a-fA-F:]*::' and 'IPv6::'. If necessary,
+ the prior format can be retained by compiling with:
+ APPENDDEF(`conf_sendmail_ENVDEF', `-DIPV6_FULL=0')
+ in your devtools/Site/site.config.m4 file.
+ If debugging is turned on (-d0.14) also print the OpenSSL
+ versions, both build time and run time
+ (provided STARTTLS is compiled in).
+ If a connection to the MTA is dropped by the client before its
+ hostname can be validated, treat it as "may be forged",
+ so that the unvalidated hostname is not passed to a
+ milter in xxfi_connect().
+ Add a timeout for communication with socket map servers
+ which can be specified using the -d option.
+ Add a compile time option HESIOD_ALLOW_NUMERIC_LOGIN to allow
+ numeric logins even if HESIOD is enabled.
+ The new option CertFingerprintAlgorithm specifies the finger-
+ print algorithm (digest) to use for the presented cert.
+ If the option is not set, md5 is used and the macro
+ {cert_md5} contains the cert fingerprint.
+ However, if the option is set, the specified algorithm
+ (e.g., sha1) is used and the macro {cert_fp} contains
+ the cert fingerprint.
+ That is, as long as the option is not set, the behaviour
+ does not change, but otherwise, {cert_md5} is superseded
+ by {cert_fp} even if you set CertFingerprintAlgorithm
+ to md5.
+ The options ServerSSLOptions and ClientSSLOptions can be used
+ to set SSL options for the server and client side
+ respectively. See SSL_CTX_set_options(3) for a list.
+ Note: this change turns on SSL_OP_NO_SSLv2 and
+ SSL_OP_NO_TICKET for the client. See doc/op/op.me
+ for details.
+ The option CipherList sets the list of ciphers for STARTTLS.
+ See ciphers(1) for possible values.
+ Do not log "STARTTLS: internal error: tls_verify_cb: ssl == NULL"
+ if a CRLFfile is in use (and LogLevel is 14 or higher.)
+ Store a more specific TLS protocol version in ${tls_version}
+ instead of a generic one, e.g., TLSv1 instead of
+ TLSv1/SSLv3.
+ Properly set {client_port} value on little endian machines.
+ Patch from Kelsey Cummings of Sonic.net.
+ Per RFC 3848, indicate in the Received: header whether SSL or
+ SMTP AUTH was negotiated by setting the protocol clause
+ to ESMTPS, ESMTPA, or ESMTPSA instead of ESMTP.
+ If the 'C' flag is listed as TLSSrvOptions the requirement for the
+ TLS server to have a cert is removed. This only works
+ under very specific circumstances and should only be used
+ if the consequences are understood, e.g., clients
+ may not work with a server using this.
+ The options ClientCertFile, ClientKeyFile, ServerCertFile, and
+ ServerKeyFile can take a second file name, which must be
+ separated from the first with a comma (note: do not use
+ any spaces) to set up a second cert/key pair. This can
+ be used to have certs of different types, e.g., RSA
+ and DSA.
+ A new map type "arpa" is available to reverse an IP (IPv4 or IPv6)
+ address. It returns the string for the PTR lookup, but
+ without trailing {ip6,in-addr}.arpa.
+ New operation mode 'C' just checks the configuration file, e.g.,
+ sendmail -C new.cf -bC
+ will perform a basic syntax/consistency check of new.cf.
+ The mailer flag 'I' is deprecated and will be removed in a
+ future version.
+ Allow local (not just TCP) socket connections to the server, e.g.,
+ O DaemonPortOptions=Family=local, Addr=/var/mta/server.sock
+ can be used.
+ If the new option MaxQueueAge is set to a value greater than zero,
+ entries in the queue will be retried during a queue run
+ only if the individual retry time has been reached which
+ is doubled for each attempt. The maximum retry time is
+ limited by the specified value.
+ New DontBlameSendmail option GroupReadableDefaultAuthInfoFile
+ to relax requirement for DefaultAuthInfo file.
+ Reset timeout after receiving a message to appropriate value if
+ STARTTLS is in use. Based on patch by Kelsey Cummings
+ of Sonic.net.
+ Report correct error messages from the LDAP library for a range of
+ small negative return values covering those used by OpenLDAP.
+ Fix compilation with Berkeley DB 5.0 and 6.0. Patch from
+ Allan E Johannesen of Worcester Polytechnic Institute.
+ CONFIG: FEATURE(`nopercenthack') takes one parameter: reject or
+ nospecial which describes whether to disallow "%" in the
+ local part of an address.
+ DEVTOOLS: Fix regression in auto-detection of libraries when only
+ shared libraries are available. Problem reported by
+ Bryan Costales.
+ LIBMILTER: Mark communication socket as close-on-exec in case
+ a user's filter starts other applications.
+ Based on patch from Paul Howarth.
+ Portability:
+ SunOS 5.12 has changed the API for sigwait(2) to conform
+ with XPG7. Based on patch from Roger Faulkner of Oracle.
+ Deleted Files:
+ libsm/path.c
+
+8.14.9/8.14.9 2014/05/21
+ SECURITY: Properly set the close-on-exec flag for file descriptors
+ (except stdin, stdout, and stderr) before executing mailers.
+ Fix a misformed comment in conf.c: "/*" within comment
+ which may cause a compilation error on some systems.
+ Problem reported by John Beck of Oracle.
+ DEVTOOLS: Fix regression in auto-detection of libraries when only
+ shared libraries are available. Problem reported by
+ Bryan Costales.
+
+8.14.8/8.14.8 2014/01/26
+ Properly initialize all OpenSSL algorithms for versions before
+ OpenSSL 0.9.8o. Without this SHA2 algorithms may not
+ work properly, causing for example failures for certs
+ that use sha256WithRSAEncryption as signature algorithm.
+ When looking up hostnames, ensure only to return those records
+ for the requested family (AF_INET or AF_INET6).
+ On system that have NEEDSGETIPNODE and NETINET6
+ this may have failed and cause delivery problems.
+ Problem noted by Kees Cook.
+ A new mailer flag '!' is available to suppress an MH hack
+ that drops an explicit From: header if it is the
+ same as what sendmail would generate.
+ Add an FFR (for future release) to use uncompressed IPv6 addresses,
+ i.e., they will not contain "::". For example, instead
+ of ::1 it will be 0:0:0:0:0:0:0:1. This means that
+ configuration data (including maps, files, classes,
+ custom ruleset, etc) have to use the same format.
+ This will be turned on in 8.15. It can be enabled in 8.14
+ by compiling with:
+ APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_IPV6_FULL')
+ in your devtools/Site/site.config.m4 file.
+ Add an additional case for the WorkAroundBrokenAAAA check when
+ dealing with broken nameservers by ignoring SERVFAIL
+ errors returned on T_AAAA (IPv6) lookups at delivery time.
+ Problem noted by Pavel Timofeev of OCS.
+ If available, pass LOGIN_SETCPUMASK and LOGIN_SETLOGINCLASS to
+ setusercontext() on deliveries as a different user.
+ Patch from Edward Tomasz Napierala from FreeBSD.
+ Avoid compiler warnings from a change in Cyrus-SASL 2.1.25.
+ Patch from Hajimu UMEMOTO from FreeBSD.
+ Add support for DHParameters 2048-bit primes.
+ CONFIG: Accept IPv6 literals when evaluating the HELO/EHLO argument
+ in FEATURE(`block_bad_helo'). Suggested by Andrey Chernov.
+ LIBSMDB: Add a missing check for malloc() in libsmdb/smndbm.c.
+ Patch from Bill Parker.
+ LIBSMDB: Fix minor memory leaks in libsmdb/ if allocations
+ fail. Patch from John Beck of Oracle.
+ Portability:
+ Add support for Darwin 12.x and 13.x (Mac OS X 10.8 and 10.9).
+ On Linux use socklen_t as the type for the 3rd argument
+ for getsockname/getpeername if the glibc version is at
+ least 2.1.
+ Added Files:
+ devtools/OS/Darwin.12.x
+ devtools/OS/Darwin.13.x
+
8.14.7/8.14.7 2013/04/21
Drop support for IPv4-mapped IPv6 addresses to prevent the MTA
from using a mapped address over a legitimate IPv6 address
@@ -80,9 +295,12 @@
the reason for the failure in a single log line. Suggested
by James Carey of Boeing.
Portability:
- Add support for Darwin 11.x and 12.x (Mac OS X 10.7 and 10.8).
+ Add support for Darwin 11.x (Mac OS X 10.7).
Add support for SunOS 5.12 (aka Solaris 12). Patch from
John Beck of Oracle.
+ Added Files:
+ devtools/OS/Darwin.11.x
+ devtools/OS/SunOS.5.12
8.14.5/8.14.5 2011/05/17
Do not cache SMTP extensions across connections as the cache
@@ -622,7 +840,7 @@
LIBMILTER: The "hostname" argument of the xxfi_connect() callback
previously was the equivalent of {client_ptr}. However,
this did not match the documentation of the function, hence
- it has been changed to {client_name}. See doc/op/op.*
+ it has been changed to {client_name}. See doc/op/op.me
about these macros.
8.13.7/8.13.7 2006/06/14
@@ -3450,11 +3668,11 @@
Add new STARTTLS related options CACERTPath, CACERTFile,
ClientCertFile, ClientKeyFile, DHParameters, RandFile,
ServerCertFile, and ServerKeyFile. These are documented in
- cf/README and doc/op/op.*.
+ cf/README and doc/op/op.me.
New STARTTLS related macros: ${cert_issuer}, ${cert_subject},
${tls_version}, ${cipher}, ${cipher_bits}, ${verify},
${server_name}, and ${server_addr}. These are documented
- in cf/README and doc/op/op.*.
+ in cf/README and doc/op/op.me.
Add support for the Entropy Gathering Daemon (EGD) for better
random data.
New DontBlameSendmail option InsufficientEntropy for systems which
Modified: stable/0.8/contrib/sendmail/cf/README
===================================================================
--- stable/0.8/contrib/sendmail/cf/README 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/README 2016-10-01 17:46:48 UTC (rev 9102)
@@ -77,7 +77,7 @@
divert(-1)
#
- # Copyright (c) 1998-2005 Sendmail, Inc. and its suppliers.
+ # Copyright (c) 1998-2005 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -158,6 +158,26 @@
*******************************************************************
+Note:
+Some rulesets, features, and options are only useful if the sendmail
+binary has been compiled with the appropriate options, e.g., the
+ruleset tls_server is only invoked if sendmail has been compiled
+with STARTTLS. This is usually obvious from the context and hence
+not further specified here.
+There are also so called "For Future Releases" (FFR) compile time
+options which might be included in a subsequent version or might
+simply be removed as they turned out not to be really useful.
+These are generally not documented but if they are, then the required
+compile time options are listed in doc/op/op.* for rulesets and
+macros, and for mc/cf specific options they are usually listed here.
+In addition to compile time options for the sendmail binary, there
+can also be FFRs for mc/cf which in general can be enabled when the
+configuration file is generated by defining them at the top of your
+.mc file:
+
+define(`_FFR_NAME_HERE', 1)
+
+
+----------------------------+
| A BRIEF INTRODUCTION TO M4 |
+----------------------------+
@@ -397,6 +417,10 @@
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.
+RELAY_MAILER_CHARSET [undefined] If defined, messages containing 8-bit data
+ that ARRIVE from an address that resolves to the
+ relay 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.
@@ -743,6 +767,16 @@
2. don't remove "!" from OperatorChars if `reject' is
given as parameter.
+nopercenthack Don't treat % as routing character. This feature takes one
+ parameter:
+ `reject': reject addresses which have % in the local
+ part unless it originates from a system
+ that is allowed to relay.
+ `nospecial': don't do anything special with %.
+ Warnings: 1. See the notice in the anti-spam section.
+ 2. Don't remove % from OperatorChars if `reject' is
+ given as parameter.
+
nocanonify Don't pass addresses to $[ ... $] for canonification
by default, i.e., host/domain names are considered canonical,
except for unqualified names, which must not be used in this
@@ -1402,6 +1436,9 @@
that address will be looked up in the alias file; user+* and
user will not be looked up). Only use if the local
delivery agent in use supports +detail addressing.
+ Moreover, this will most likely not work if the 'w' flag
+ for the local mailer is set as the entire local address
+ including +detail is passed to the user lookup function.
compat_check Enable ruleset check_compat to look up pairs of addresses
with the Compat: tag -- Compat:sender<@>recipient -- in the
@@ -1438,7 +1475,7 @@
by default. If you have a machine with IPv6 only,
change it to
- FEATURE(`msp', `[IPv6:::1]')
+ FEATURE(`msp', `[IPv6:0:0:0:0:0:0:0:1]')
If you want to continue using '[localhost]', (the behavior
up to 8.12.6), use
@@ -1496,9 +1533,13 @@
- 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.
+ is required. Note, the block_bad_helo feature automatically
+ adds the IPv6 and IPv4 localhost IP addresses to $={w} (local
+ host names) and $={R} (relay permitted).
+
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
@@ -2439,17 +2480,19 @@
that they provide a gateway for. Use this FEATURE with caution as it
can allow spammers to relay through your server if not setup properly.
-NOTICE: It is possible to relay mail through a system which the anti-relay
-rules do not prevent: the case of a system that does use FEATURE(`nouucp',
-`nospecial') (system A) and relays local messages to a mail hub (e.g., via
-LOCAL_RELAY or LUSER_RELAY) (system B). If system B doesn't use
-FEATURE(`nouucp') at all, addresses of the form
-<example.net!user at local.host> would be relayed to <user at example.net>.
-System A doesn't recognize `!' as an address separator and therefore
-forwards it to the mail hub which in turns relays it because it came from
-a trusted local host. So if a mailserver allows UUCP (bang-format)
-addresses, all systems from which it allows relaying should do the same
-or reject those addresses.
+NOTICE: It is possible to relay mail through a system which the
+anti-relay rules do not prevent: the case of a system that does use
+FEATURE(`nouucp', `nospecial') / FEATURE(`nopercenthack', `nospecial')
+(system A) and relays local messages to a mail hub (e.g., via
+LOCAL_RELAY or LUSER_RELAY) (system B). If system B doesn't use the
+same feature (nouucp / nopercenthack) at all, addresses of the form
+<example.net!user at local.host> / <user%example.net at local.host>
+would be relayed to <user at example.net>.
+System A doesn't recognize `!' / `%' as an address separator and
+therefore forwards it to the mail hub which in turns relays it
+because it came from a trusted local host. So if a mailserver
+allows UUCP (bang-format) / %-hack addresses, all systems from which
+it allows relaying should do the same or reject those addresses.
As of 8.9, sendmail will refuse mail if the MAIL FROM: parameter has
an unresolvable domain (i.e., one that DNS, your local name service,
@@ -3157,18 +3200,50 @@
TLS_Rcpt:darth at endmail.org ENCR:112+CN:smtp.endmail.org
-Disabling STARTTLS And Setting SMTP Server Features
----------------------------------------------------
+TLS Options per Session
+-----------------------
By default STARTTLS is used whenever possible. However, there are
-some broken MTAs that don't properly implement STARTTLS. To be able
-to send to (or receive from) those MTAs, the ruleset try_tls
-(srv_features) can be used that work together with the access map.
-Entries for the access map must be tagged with Try_TLS (Srv_Features)
-and refer to the hostname or IP address of the connecting system.
-A default case can be specified by using just the tag. For example,
-the following entries in the access map:
+MTAs with STARTTLS interoperability issues. To be able to send to
+(or receive from) those MTAs several features are available:
+1) Various TLS options be be set per IP/domain.
+2) STARTTLS can be turned off for specific IP addresses/domains.
+
+About 1): the rulesets tls_srv_features and tls_clt_features can
+be used to return a (semicolon separated) list of TLS related
+options:
+
+- Options: compare {Server,Client}SSLOptions.
+- CipherList: same as the global option.
+- CertFile, KeyFile: {Server,Client}{Cert,Key}File
+
+If FEATURE(`tls_session_features') is used, then default rulesets
+are activated which look up entries in the access map with the tags
+TLS_Srv_features and TLS_Clt_features, respectively.
+For example, these entries:
+
+ TLS_Srv_features:10.0.2.4 CipherList=MEDIUM+aRSA;
+ TLS_Clt_features:10.1.0.1 Options=SSL_OP_NO_TLSv1_2; CipherList=ALL:-EXPORT
+
+specify a cipherlist with MEDIUM strength ciphers that use RSA
+certificates only for the client with the IP address 10.0.2.4,
+and turn off TLSv1.2 when connecting to the server with the IP
+address 10.1.0.1 as well as setting a specific cipherlist.
+If FEATURE(`tls_session_features') is not used the user can provide
+their own rulesets which must return the appropriate data.
+If the rulesets are not defined or do not return a value, the
+default TLS options are not modified.
+(These rulesets require the sendmail binary to be built with
+_FFR_TLS_SE_OPTS enabled.)
+
+About 2): the ruleset try_tls (srv_features) can be used that work
+together with the access map. Entries for the access map must be
+tagged with Try_TLS (Srv_Features) and refer to the hostname or IP
+address of the connecting system. A default case can be specified
+by using just the tag. For example, the following entries in the
+access map:
+
Try_TLS:broken.server NO
Srv_Features:my.domain v
Srv_Features: V
@@ -3753,6 +3828,12 @@
cached but otherwise idle connection
to a host will prevent other sendmails
from connecting to the other host.
+confUSE_COMPRESSED_IPV6_ADDRESSES
+ UseCompressedIPv6Addresses
+ [undefined] If set, use the compressed
+ form of IPv6 addresses, such as
+ IPV6:::1, instead of the uncompressed
+ form, such as IPv6:0:0:0:0:0:0:0:1.
confUSE_ERRORS_TO* UseErrorsTo [False] Use the Errors-To: header to
deliver error messages. This should
not be necessary because of general
@@ -3987,6 +4068,13 @@
confQUEUE_SORT_ORDER QueueSortOrder [Priority] Queue sort algorithm:
Priority, Host, Filename, Random,
Modification, or Time.
+confMAX_QUEUE_AGE MaxQueueAge [undefined] If set to a value greater
+ than zero, entries in the queue
+ will be retried during a queue run
+ only if the individual retry time
+ has been reached which is doubled
+ for each attempt. The maximum retry
+ time is limited by the specified value.
confMIN_QUEUE_AGE MinQueueAge [0] The minimum amount of time a job
must sit in the queue between queue
runs. This allows you to set the
@@ -4205,7 +4293,7 @@
confAUTH_REALM AuthRealm [undefined] The authentication realm
that is passed to the Cyrus SASL
library. If no realm is specified,
- $j is used.
+ $j is used. See KNOWNBUGS.
confDEF_AUTH_INFO DefaultAuthInfo [undefined] Name of file that contains
authentication information for
outgoing connections. This file must
@@ -4238,6 +4326,14 @@
verification is performed, i.e.,
the server doesn't ask for a
certificate.
+confSERVER_SSL_OPTIONS ServerSSLOptions [undefined] SSL related
+ options for server side. See
+ SSL_CTX_set_options(3) for a list.
+confCLIENT_SSL_OPTIONS ClientSSLOptions [undefined] SSL related
+ options for client side. See
+ SSL_CTX_set_options(3) for a list.
+confCIPHER_LIST CipherList [undefined] Cipher list for TLS.
+ See ciphers(1) for possible values.
confLDAP_DEFAULT_SPEC LDAPDefaultSpec [undefined] Default map
specification for LDAP maps. The
value should only contain LDAP
@@ -4247,10 +4343,11 @@
maps unless they are specified in
the individual map specification
('K' command).
-confCACERT_PATH CACertPath [undefined] Path to directory
- with certs of CAs.
-confCACERT CACertFile [undefined] File containing one CA
- cert.
+confCACERT_PATH CACertPath [undefined] Path to directory with
+ certificates of CAs which must contain
+ their hashes as filenames or links.
+confCACERT CACertFile [undefined] File containing at least
+ one CA certificate.
confSERVER_CERT ServerCertFile [undefined] File containing the
cert of the server, i.e., this cert
is used when sendmail acts as
@@ -4278,6 +4375,10 @@
requires this option if the compile
flag HASURANDOM is not set (see
sendmail/README).
+confCERT_FINGERPRINT_ALGORITHM CertFingerprintAlgorithm
+ [undefined] The fingerprint algorithm
+ (digest) to use for the presented
+ cert.
confNICE_QUEUE_RUN NiceQueueRun [undefined] If set, the priority of
queue runners is set the given value
(nice(3)).
@@ -4701,4 +4802,4 @@
8 DNS based blacklists
9 special local rulesets (1 and 2)
-$Revision: 1.1.1.7 $, Last updated $Date: 2013-08-14 22:35:47 $
+$Revision: 8.730 $, Last updated $Date: 2014-01-16 15:55:51 $
Modified: stable/0.8/contrib/sendmail/cf/cf/Makefile
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/Makefile 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/Makefile 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,7 +1,7 @@
#
# Makefile for configuration files.
#
-# $Id: Makefile,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $
+# $Id: Makefile,v 8.60 2005-06-14 02:16:34 gshapiro Exp $
#
#
@@ -100,6 +100,7 @@
${CFDIR}/feature/access_db.m4 \
${CFDIR}/feature/allmasquerade.m4 \
${CFDIR}/feature/always_add_domain.m4 \
+ ${CFDIR}/feature/bcc.m4 \
${CFDIR}/feature/bestmx_is_local.m4 \
${CFDIR}/feature/bitdomain.m4 \
${CFDIR}/feature/blacklist_recipients.m4 \
@@ -118,9 +119,11 @@
${CFDIR}/feature/masquerade_envelope.m4 \
${CFDIR}/feature/no_default_msa.m4 \
${CFDIR}/feature/nocanonify.m4 \
+ ${CFDIR}/feature/nopercenthack.m4 \
${CFDIR}/feature/notsticky.m4 \
${CFDIR}/feature/nouucp.m4 \
${CFDIR}/feature/nullclient.m4 \
+ ${CFDIR}/feature/prefixmod.m4 \
${CFDIR}/feature/promiscuous_relay.m4 \
${CFDIR}/feature/redirect.m4 \
${CFDIR}/feature/ratecontrol.m4 \
@@ -131,6 +134,7 @@
${CFDIR}/feature/relay_mail_from.m4 \
${CFDIR}/feature/smrsh.m4 \
${CFDIR}/feature/stickyhost.m4 \
+ ${CFDIR}/feature/tls_session_features.m4 \
${CFDIR}/feature/use_ct_file.m4 \
${CFDIR}/feature/use_cw_file.m4 \
${CFDIR}/feature/uucpdomain.m4 \
@@ -137,6 +141,7 @@
${CFDIR}/feature/virtuser_entire_domain.m4 \
${CFDIR}/feature/virtusertable.m4 \
${CFDIR}/hack/cssubdomain.m4 \
+ ${CFDIR}/hack/xconnect.m4 \
${CFDIR}/m4/cf.m4 \
${CFDIR}/m4/cfhead.m4 \
${CFDIR}/m4/proto.m4 \
Modified: stable/0.8/contrib/sendmail/cf/cf/README
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/README 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/README 2016-10-01 17:46:48 UTC (rev 9102)
@@ -31,4 +31,4 @@
For more details see Makefile.
-$Revision: 1.1.1.2 $, Last updated $Date: 2006-02-25 02:33:54 $
+$Revision: 1.2 $, Last updated $Date: 2002-02-22 00:33:54 $
Modified: stable/0.8/contrib/sendmail/cf/cf/chez.cs.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/chez.cs.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/chez.cs.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -24,7 +24,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: chez.cs.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: chez.cs.mc,v 8.15 2013-11-22 20:51:08 ca Exp $')
OSTYPE(bsd4.4)dnl
DOMAIN(CS.Berkeley.EDU)dnl
define(`LOCAL_RELAY', vangogh.CS.Berkeley.EDU)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/clientproto.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/clientproto.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/clientproto.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2000 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -23,7 +23,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: clientproto.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: clientproto.mc,v 8.17 2013-11-22 20:51:08 ca Exp $')
OSTYPE(unknown)
FEATURE(nullclient, mailhost.$m)
Modified: stable/0.8/contrib/sendmail/cf/cf/cs-hpux10.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/cs-hpux10.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/cs-hpux10.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -23,7 +23,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: cs-hpux10.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: cs-hpux10.mc,v 8.14 2013-11-22 20:51:08 ca Exp $')
OSTYPE(hpux10)dnl
DOMAIN(CS.Berkeley.EDU)dnl
define(`MAIL_HUB', mailspool.CS.Berkeley.EDU)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/cs-hpux9.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/cs-hpux9.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/cs-hpux9.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -23,7 +23,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: cs-hpux9.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: cs-hpux9.mc,v 8.15 2013-11-22 20:51:08 ca Exp $')
OSTYPE(hpux9)dnl
DOMAIN(CS.Berkeley.EDU)dnl
define(`MAIL_HUB', mailspool.CS.Berkeley.EDU)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/cs-osf1.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/cs-osf1.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/cs-osf1.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -23,7 +23,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: cs-osf1.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: cs-osf1.mc,v 8.14 2013-11-22 20:51:08 ca Exp $')
OSTYPE(osf1)dnl
DOMAIN(CS.Berkeley.EDU)dnl
MAILER(local)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/cs-solaris2.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/cs-solaris2.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/cs-solaris2.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -23,7 +23,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: cs-solaris2.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: cs-solaris2.mc,v 8.13 2013-11-22 20:51:08 ca Exp $')
OSTYPE(solaris2)dnl
DOMAIN(CS.Berkeley.EDU)dnl
MAILER(local)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/cs-sunos4.1.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/cs-sunos4.1.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/cs-sunos4.1.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -23,7 +23,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: cs-sunos4.1.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: cs-sunos4.1.mc,v 8.14 2013-11-22 20:51:08 ca Exp $')
OSTYPE(sunos4.1)dnl
DOMAIN(CS.Berkeley.EDU)dnl
MAILER(local)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/cs-ultrix4.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/cs-ultrix4.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/cs-ultrix4.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -23,7 +23,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: cs-ultrix4.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: cs-ultrix4.mc,v 8.14 2013-11-22 20:51:08 ca Exp $')
OSTYPE(ultrix4)dnl
DOMAIN(CS.Berkeley.EDU)dnl
MAILER(local)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/cyrusproto.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/cyrusproto.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/cyrusproto.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -27,7 +27,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: cyrusproto.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: cyrusproto.mc,v 8.7 1999-09-07 14:57:10 ca Exp $')
define(`confBIND_OPTS',`-DNSRCH -DEFNAMES')
define(`confLOCAL_MAILER', `cyrus')
FEATURE(`nocanonify')
Modified: stable/0.8/contrib/sendmail/cf/cf/generic-bsd4.4.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/generic-bsd4.4.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/generic-bsd4.4.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -21,7 +21,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: generic-bsd4.4.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: generic-bsd4.4.mc,v 8.11 2013-11-22 20:51:08 ca Exp $')
OSTYPE(bsd4.4)dnl
DOMAIN(generic)dnl
MAILER(local)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/generic-hpux10.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/generic-hpux10.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/generic-hpux10.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999, 2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999, 2001 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -20,7 +20,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: generic-hpux10.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: generic-hpux10.mc,v 8.14 2013-11-22 20:51:08 ca Exp $')
OSTYPE(hpux10)dnl
DOMAIN(generic)dnl
MAILER(local)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/generic-hpux9.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/generic-hpux9.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/generic-hpux9.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -20,7 +20,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: generic-hpux9.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: generic-hpux9.mc,v 8.12 2013-11-22 20:51:08 ca Exp $')
OSTYPE(hpux9)dnl
DOMAIN(generic)dnl
MAILER(local)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/generic-linux.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/generic-linux.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/generic-linux.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -20,7 +20,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: generic-linux.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: generic-linux.mc,v 8.2 2013-11-22 20:51:08 ca Exp $')
OSTYPE(linux)dnl
DOMAIN(generic)dnl
MAILER(local)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/generic-mpeix.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/generic-mpeix.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/generic-mpeix.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -17,7 +17,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: generic-mpeix.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: generic-mpeix.mc,v 8.2 2013-11-22 20:51:08 ca Exp $')
OSTYPE(mpeix)dnl
DOMAIN(generic)dnl
define(`confFORWARD_PATH', `$z/.forward')dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/generic-nextstep3.3.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/generic-nextstep3.3.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/generic-nextstep3.3.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -20,7 +20,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: generic-nextstep3.3.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: generic-nextstep3.3.mc,v 8.11 2013-11-22 20:51:08 ca Exp $')
OSTYPE(nextstep)dnl
DOMAIN(generic)dnl
MAILER(local)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/generic-osf1.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/generic-osf1.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/generic-osf1.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -20,7 +20,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: generic-osf1.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: generic-osf1.mc,v 8.12 2013-11-22 20:51:08 ca Exp $')
OSTYPE(osf1)dnl
DOMAIN(generic)dnl
MAILER(local)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/generic-solaris.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/generic-solaris.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/generic-solaris.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999, 2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999, 2001 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -22,7 +22,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: generic-solaris.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: generic-solaris.mc,v 8.14 2013-11-22 20:51:08 ca Exp $')
OSTYPE(solaris2)dnl
DOMAIN(generic)dnl
MAILER(local)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/generic-sunos4.1.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/generic-sunos4.1.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/generic-sunos4.1.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -20,7 +20,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: generic-sunos4.1.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: generic-sunos4.1.mc,v 8.12 2013-11-22 20:51:08 ca Exp $')
OSTYPE(sunos4.1)dnl
DOMAIN(generic)dnl
MAILER(local)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/generic-ultrix4.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/generic-ultrix4.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/generic-ultrix4.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -20,7 +20,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: generic-ultrix4.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: generic-ultrix4.mc,v 8.12 2013-11-22 20:51:08 ca Exp $')
OSTYPE(ultrix4)dnl
DOMAIN(generic)dnl
MAILER(local)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/huginn.cs.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/huginn.cs.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/huginn.cs.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -22,7 +22,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: huginn.cs.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: huginn.cs.mc,v 8.16 2013-11-22 20:51:08 ca Exp $')
OSTYPE(hpux9)dnl
DOMAIN(CS.Berkeley.EDU)dnl
MASQUERADE_AS(CS.Berkeley.EDU)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/knecht.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/knecht.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/knecht.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998-2001, 2004, 2005 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2001, 2004, 2005 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -19,7 +19,7 @@
#
divert(0)
-VERSIONID(`$Id: knecht.mc,v 1.1.1.4 2007-11-23 22:10:30 laffer1 Exp $')
+VERSIONID(`$Id: knecht.mc,v 8.63 2013-11-22 20:51:08 ca Exp $')
OSTYPE(bsd4.4)
DOMAIN(generic)
Modified: stable/0.8/contrib/sendmail/cf/cf/mail.cs.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/mail.cs.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/mail.cs.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -22,7 +22,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: mail.cs.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: mail.cs.mc,v 8.19 2013-11-22 20:51:08 ca Exp $')
OSTYPE(ultrix4)dnl
DOMAIN(Berkeley.EDU)dnl
MASQUERADE_AS(CS.Berkeley.EDU)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/mail.eecs.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/mail.eecs.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/mail.eecs.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -22,7 +22,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: mail.eecs.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: mail.eecs.mc,v 8.19 2013-11-22 20:51:08 ca Exp $')
OSTYPE(ultrix4)dnl
DOMAIN(EECS.Berkeley.EDU)dnl
MASQUERADE_AS(EECS.Berkeley.EDU)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/mailspool.cs.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/mailspool.cs.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/mailspool.cs.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -24,7 +24,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: mailspool.cs.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: mailspool.cs.mc,v 8.13 2013-11-22 20:51:08 ca Exp $')
OSTYPE(sunos4.1)dnl
DOMAIN(CS.Berkeley.EDU)dnl
MAILER(local)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/python.cs.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/python.cs.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/python.cs.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -24,7 +24,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: python.cs.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: python.cs.mc,v 8.13 2013-11-22 20:51:08 ca Exp $')
OSTYPE(bsd4.4)dnl
DOMAIN(CS.Berkeley.EDU)dnl
define(`LOCAL_RELAY', vangogh.CS.Berkeley.EDU)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/s2k-osf1.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/s2k-osf1.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/s2k-osf1.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -23,7 +23,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: s2k-osf1.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: s2k-osf1.mc,v 8.14 2013-11-22 20:51:08 ca Exp $')
OSTYPE(osf1)dnl
DOMAIN(S2K.Berkeley.EDU)dnl
MAILER(local)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/s2k-ultrix4.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/s2k-ultrix4.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/s2k-ultrix4.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -23,7 +23,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: s2k-ultrix4.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: s2k-ultrix4.mc,v 8.14 2013-11-22 20:51:08 ca Exp $')
OSTYPE(ultrix4)dnl
DOMAIN(S2K.Berkeley.EDU)dnl
MAILER(local)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/submit.cf
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/submit.cf 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/submit.cf 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1998-2004, 2009, 2010 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2004, 2009, 2010 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983, 1995 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -16,8 +16,8 @@
#####
##### SENDMAIL CONFIGURATION FILE
#####
-##### built by ca at wiz.smi.sendmail.com on Fri Apr 19 08:04:44 PDT 2013
-##### in /extra/home/ca/sm-8.14.7/OpenSource/sendmail-8.14.7/cf/cf
+##### built by ca at sandman.dev-lab.sendmail.com on Thu Jul 2 05:24:31 PDT 2015
+##### in /x/ca/smi.git/sendmail/OpenSource/sendmail-8.15.2/cf/cf
##### using ../ as configuration include directory
#####
######################################################################
@@ -27,15 +27,15 @@
######################################################################
######################################################################
-##### $Id: submit.cf,v 1.1.1.9 2013-08-14 22:35:47 laffer1 Exp $ #####
-##### $Id: submit.cf,v 1.1.1.9 2013-08-14 22:35:47 laffer1 Exp $ #####
-##### $Id: submit.cf,v 1.1.1.9 2013-08-14 22:35:47 laffer1 Exp $ #####
-##### $Id: submit.cf,v 1.1.1.9 2013-08-14 22:35:47 laffer1 Exp $ #####
+##### $Id: cfhead.m4,v 8.122 2013-11-22 20:51:13 ca Exp $ #####
+##### $Id: cf.m4,v 8.33 2013-11-22 20:51:13 ca Exp $ #####
+##### $Id: submit.mc,v 8.15 2013-11-22 20:51:08 ca Exp $ #####
+##### $Id: msp.m4,v 1.34 2013-11-22 20:51:11 ca Exp $ #####
-##### $Id: submit.cf,v 1.1.1.9 2013-08-14 22:35:47 laffer1 Exp $ #####
+##### $Id: no_default_msa.m4,v 8.3 2013-11-22 20:51:11 ca Exp $ #####
-##### $Id: submit.cf,v 1.1.1.9 2013-08-14 22:35:47 laffer1 Exp $ #####
+##### $Id: proto.m4,v 8.762 2013-11-22 20:51:13 ca Exp $ #####
# level 10 config file format
V10/Berkeley
@@ -114,7 +114,7 @@
# Configuration version number
-DZ8.14.7/Submit
+DZ8.15.2/Submit
###############
@@ -202,6 +202,9 @@
# use Errors-To: header?
O UseErrorsTo=False
+# use compressed IPv6 address format?
+#O UseCompressedIPv6Addresses
+
# log level
O LogLevel=9
@@ -251,6 +254,9 @@
# minimum time in queue before retry
#O MinQueueAge=30m
+# maximum time in queue before retry (if > 0; only for exponential delay)
+#O MaxQueueAge
+
# how many jobs can you process in the queue?
#O MaxQueueRunSize=0
@@ -501,6 +507,12 @@
# SMTP STARTTLS server options
#O TLSSrvOptions
+# SSL cipherlist
+#O CipherList
+# server side SSL options
+#O ServerSSLOptions
+# client side SSL options
+#O ClientSSLOptions
# Input mail filters
#O InputMailFilters
@@ -524,6 +536,8 @@
#O DHParameters
# Random data source (required for systems without /dev/urandom under OpenSSL)
#O RandFile
+# fingerprint algorithm (digest) to use for the presented cert
+#O CertFingerprintAlgorithm
# Maximum number of "useless" commands before slowing down
#O MaxNOOPCommands=20
@@ -531,6 +545,8 @@
# Name to use for EHLO (defaults to $j)
#O HeloName
+
+
############################
# QUEUE GROUP DEFINITIONS #
############################
@@ -645,6 +661,7 @@
# if we have % signs, take the rightmost one
R$* % $* $1 @ $2 First make them all @s.
R$* @ $* @ $* $1 % $2 @ $3 Undo all but the last.
+
R$* @ $* $@ $>Canonify2 $1 < @ $2 > Insert < > and finish
# else we must be a local name
@@ -781,6 +798,7 @@
$@ $>Parse0 $>canonify $1 $2 $3 ...@*LOCAL* -> ...
R$* < @ *LOCAL* > $: $1
+
#
# Parse1 -- the bottom half of ruleset 0.
#
@@ -818,6 +836,8 @@
R$=L $#local $: @ $1 special local names
R$+ $#local $: $1 regular local names
+
+
###########################################################################
### Ruleset 5 -- special rewriting after aliases have been expanded ###
###########################################################################
@@ -1027,6 +1047,10 @@
R<@> < $* @ localhost > $: < ? $&{client_name} > < $1 @ localhost >
R<@> < $* @ [127.0.0.1] >
$: < ? $&{client_name} > < $1 @ [127.0.0.1] >
+R<@> < $* @ [IPv6:0:0:0:0:0:0:0:1] >
+ $: < ? $&{client_name} > < $1 @ [IPv6:0:0:0:0:0:0:0:1] >
+R<@> < $* @ [IPv6:::1] >
+ $: < ? $&{client_name} > < $1 @ [IPv6:::1] >
R<@> < $* @ localhost.$m >
$: < ? $&{client_name} > < $1 @ localhost.$m >
R<@> < $* @ localhost.UUCP >
@@ -1141,6 +1165,7 @@
R$@ $@ RELAY originated locally
R0 $@ RELAY originated locally
R127.0.0.1 $@ RELAY originated locally
+RIPv6:0:0:0:0:0:0:0:1 $@ RELAY originated locally
RIPv6:::1 $@ RELAY originated locally
R$=R $* $@ RELAY relayable IP address
R$* $: [ $1 ] put brackets around it...
@@ -1245,6 +1270,8 @@
RSOFTWARE $#error $@ 4.7.0 $: "403 TLS handshake."
+
+
######################################################################
### RelayTLS: allow relaying based on TLS authentication
###
@@ -1299,7 +1326,7 @@
### Local and Program Mailer specification ###
##################################################
-##### $Id: submit.cf,v 1.1.1.9 2013-08-14 22:35:47 laffer1 Exp $ #####
+##### $Id: local.m4,v 8.60 2013-11-22 20:51:14 ca Exp $ #####
#
# Envelope sender rewriting
@@ -1351,7 +1378,7 @@
### SMTP Mailer specification ###
#####################################
-##### $Id: submit.cf,v 1.1.1.9 2013-08-14 22:35:47 laffer1 Exp $ #####
+##### $Id: smtp.m4,v 8.66 2013-11-22 20:51:14 ca Exp $ #####
#
# common sender and masquerading recipient rewriting
@@ -1442,7 +1469,7 @@
### submit.mc ###
# divert(-1)
# #
-# # Copyright (c) 2001-2003 Sendmail, Inc. and its suppliers.
+# # Copyright (c) 2001-2003, 2014 Proofpoint, Inc. and its suppliers.
# # All rights reserved.
# #
# # By using this file, you agree to the terms and conditions set
@@ -1457,7 +1484,7 @@
# #
#
# divert(0)dnl
-# VERSIONID(`$Id: submit.cf,v 1.1.1.9 2013-08-14 22:35:47 laffer1 Exp $')
+# VERSIONID(`$Id: submit.mc,v 8.15 2013-11-22 20:51:08 ca Exp $')
# define(`confCF_VERSION', `Submit')dnl
# define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining
# define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet
@@ -1464,5 +1491,5 @@
# define(`confTIME_ZONE', `USE_TZ')dnl
# define(`confDONT_INIT_GROUPS', `True')dnl
# dnl
-# dnl If you use IPv6 only, change [127.0.0.1] to [IPv6:::1]
+# dnl If you use IPv6 only, change [127.0.0.1] to [IPv6:0:0:0:0:0:0:0:1]
# FEATURE(`msp', `[127.0.0.1]')dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/submit.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/submit.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/submit.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2001-2003 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2001-2003, 2014 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -15,7 +15,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: submit.mc,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $')
+VERSIONID(`$Id: submit.mc,v 8.15 2013-11-22 20:51:08 ca Exp $')
define(`confCF_VERSION', `Submit')dnl
define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining
define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet
@@ -22,5 +22,5 @@
define(`confTIME_ZONE', `USE_TZ')dnl
define(`confDONT_INIT_GROUPS', `True')dnl
dnl
-dnl If you use IPv6 only, change [127.0.0.1] to [IPv6:::1]
+dnl If you use IPv6 only, change [127.0.0.1] to [IPv6:0:0:0:0:0:0:0:1]
FEATURE(`msp', `[127.0.0.1]')dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/tcpproto.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/tcpproto.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/tcpproto.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2000 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -26,7 +26,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: tcpproto.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: tcpproto.mc,v 8.15 2013-11-22 20:51:08 ca Exp $')
OSTYPE(`unknown')
FEATURE(`nouucp', `reject')
MAILER(`local')
Modified: stable/0.8/contrib/sendmail/cf/cf/ucbarpa.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/ucbarpa.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/ucbarpa.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -21,7 +21,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: ucbarpa.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: ucbarpa.mc,v 8.13 2013-11-22 20:51:08 ca Exp $')
DOMAIN(CS.Berkeley.EDU)dnl
OSTYPE(bsd4.4)dnl
MAILER(local)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/ucbvax.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/ucbvax.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/ucbvax.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -22,7 +22,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: ucbvax.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: ucbvax.mc,v 8.15 2013-11-22 20:51:08 ca Exp $')
OSTYPE(bsd4.3)
DOMAIN(CS.Berkeley.EDU)
MASQUERADE_AS(CS.Berkeley.EDU)
Modified: stable/0.8/contrib/sendmail/cf/cf/uucpproto.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/uucpproto.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/uucpproto.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -26,7 +26,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: uucpproto.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: uucpproto.mc,v 8.16 2013-11-22 20:51:08 ca Exp $')
OSTYPE(unknown)
FEATURE(promiscuous_relay)dnl
FEATURE(accept_unresolvable_domains)dnl
Modified: stable/0.8/contrib/sendmail/cf/cf/vangogh.cs.mc
===================================================================
--- stable/0.8/contrib/sendmail/cf/cf/vangogh.cs.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/cf/vangogh.cs.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -23,7 +23,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: vangogh.cs.mc,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: vangogh.cs.mc,v 8.14 2013-11-22 20:51:08 ca Exp $')
DOMAIN(CS.Berkeley.EDU)dnl
OSTYPE(bsd4.4)dnl
MAILER(local)dnl
Modified: stable/0.8/contrib/sendmail/cf/domain/Berkeley.EDU.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/domain/Berkeley.EDU.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/domain/Berkeley.EDU.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -12,7 +12,7 @@
#
#
divert(0)
-VERSIONID(`$Id: Berkeley.EDU.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: Berkeley.EDU.m4,v 8.18 2013-11-22 20:51:10 ca Exp $')
DOMAIN(berkeley-only)dnl
define(`BITNET_RELAY', `bitnet-relay.Berkeley.EDU')dnl
define(`UUCP_RELAY', `uucp-relay.Berkeley.EDU')dnl
Modified: stable/0.8/contrib/sendmail/cf/domain/CS.Berkeley.EDU.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/domain/CS.Berkeley.EDU.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/domain/CS.Berkeley.EDU.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -12,7 +12,7 @@
#
#
divert(0)
-VERSIONID(`$Id: CS.Berkeley.EDU.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: CS.Berkeley.EDU.m4,v 8.11 2013-11-22 20:51:10 ca Exp $')
DOMAIN(Berkeley.EDU)dnl
HACK(cssubdomain)dnl
define(`confUSERDB_SPEC',
Modified: stable/0.8/contrib/sendmail/cf/domain/EECS.Berkeley.EDU.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/domain/EECS.Berkeley.EDU.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/domain/EECS.Berkeley.EDU.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -12,6 +12,6 @@
#
#
divert(0)
-VERSIONID(`$Id: EECS.Berkeley.EDU.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: EECS.Berkeley.EDU.m4,v 8.11 2013-11-22 20:51:10 ca Exp $')
DOMAIN(Berkeley.EDU)dnl
MASQUERADE_AS(EECS.Berkeley.EDU)dnl
Modified: stable/0.8/contrib/sendmail/cf/domain/S2K.Berkeley.EDU.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/domain/S2K.Berkeley.EDU.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/domain/S2K.Berkeley.EDU.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -12,6 +12,6 @@
#
#
divert(0)
-VERSIONID(`$Id: S2K.Berkeley.EDU.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: S2K.Berkeley.EDU.m4,v 8.11 2013-11-22 20:51:10 ca Exp $')
DOMAIN(CS.Berkeley.EDU)dnl
MASQUERADE_AS(postgres.Berkeley.EDU)dnl
Modified: stable/0.8/contrib/sendmail/cf/domain/berkeley-only.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/domain/berkeley-only.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/domain/berkeley-only.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -12,7 +12,7 @@
#
#
divert(0)
-VERSIONID(`$Id: berkeley-only.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: unspecified-domain.m4,v 8.11 2013-11-22 20:51:10 ca Exp $')
errprint(`*** ERROR: You are trying to use the Berkeley sample configuration')
errprint(` files outside of the Computer Science Division at Berkeley.')
errprint(` The configuration (.mc) files must be customized to reference')
Modified: stable/0.8/contrib/sendmail/cf/domain/generic.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/domain/generic.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/domain/generic.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -20,7 +20,7 @@
# files.
#
divert(0)
-VERSIONID(`$Id: generic.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: generic.m4,v 8.16 2013-11-22 20:51:10 ca Exp $')
define(`confFORWARD_PATH', `$z/.forward.$w+$h:$z/.forward+$h:$z/.forward.$w:$z/.forward')dnl
define(`confMAX_HEADERS_LENGTH', `32768')dnl
FEATURE(`redirect')dnl
Modified: stable/0.8/contrib/sendmail/cf/feature/accept_unqualified_senders.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/accept_unqualified_senders.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/accept_unqualified_senders.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: accept_unqualified_senders.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: accept_unqualified_senders.m4,v 8.7 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_ACCEPT_UNQUALIFIED_SENDERS_', 1)
Modified: stable/0.8/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: accept_unresolvable_domains.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: accept_unresolvable_domains.m4,v 8.11 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_ACCEPT_UNRESOLVABLE_DOMAINS_', 1)
Modified: stable/0.8/contrib/sendmail/cf/feature/access_db.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/access_db.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/access_db.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998-2002, 2004, 2006 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2002, 2004, 2006 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: access_db.m4,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $')
+VERSIONID(`$Id: access_db.m4,v 8.28 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_ACCESS_TABLE_', `')
Modified: stable/0.8/contrib/sendmail/cf/feature/allmasquerade.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/allmasquerade.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/allmasquerade.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2000 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: allmasquerade.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: allmasquerade.m4,v 8.14 2013-11-22 20:51:11 ca Exp $')
divert(-1)
ifdef(`_MAILER_local_',
Modified: stable/0.8/contrib/sendmail/cf/feature/always_add_domain.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/always_add_domain.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/always_add_domain.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2000 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: always_add_domain.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: always_add_domain.m4,v 8.12 2013-11-22 20:51:11 ca Exp $')
divert(-1)
ifdef(`_MAILER_local_',
Modified: stable/0.8/contrib/sendmail/cf/feature/authinfo.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/authinfo.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/authinfo.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000-2002 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: authinfo.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: authinfo.m4,v 1.10 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_AUTHINFO_TABLE_', `')
Modified: stable/0.8/contrib/sendmail/cf/feature/badmx.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/badmx.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/badmx.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2006 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2006 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: badmx.m4,v 1.1.1.1 2007-11-23 22:10:30 laffer1 Exp $')
+VERSIONID(`$Id: badmx.m4,v 1.2 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_BADMX_CHK_', 1)
Copied: stable/0.8/contrib/sendmail/cf/feature/bcc.m4 (from rev 9097, trunk/contrib/sendmail/cf/feature/bcc.m4)
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/bcc.m4 (rev 0)
+++ stable/0.8/contrib/sendmail/cf/feature/bcc.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -0,0 +1,90 @@
+divert(-1)
+#
+# Copyright (c) 2014 Proofpoint, Inc. and its suppliers.
+# All rights reserved.
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the sendmail distribution.
+#
+#
+
+divert(-1)
+# Arguments:
+# 1: Map to use
+# - empty/none: default map bcctable
+# - `access': to use access_db (with bcc: as tag)
+# - map definition
+# The map contains domain names and the RHS should be simply "ok".
+# If the access map is used, then its lookup algorithm is used.
+# Otherwise:
+# domain ok
+# matches anything at domain
+# .domain ok
+# matches any subdomain, e.g., l at sub.domain and l at sub.dom.domain
+# On a match, the original address will be used as bcc address unless
+# argument 3 is set.
+# 2: Name of host ([mailer:]host)
+# 3: Default bcc address: if set, this will be always used.
+# Only one of 2/3 can be empty.
+# Note: if Bcc address is used then only one copy will be sent!
+# (due to duplicate elimination)
+# 4: Map definition for canonicalRcpt map of address rewriting to
+# apply to the added bcc envelope recipients.
+# The option -T<TMPF> is required to handle temporary map failures.
+#
+# The ruleset must return either
+# - an e-mail address (user at dom.ain) which is then added as "bcc" recipient.
+# - an empty string: do not add a "bcc" recipient, or
+# - $#error: fail the SMTP transaction (e.g., temporary lookup failure)
+#
+# This feature sets O AddBcc=true
+
+ifelse(lower(_ARG_),`access',`define(`_BCC_ACCESS_', `1')')
+define(`_ADD_BCC_', `1')
+
+ifdef(`_BCC_ACCESS_', `dnl
+ifdef(`_ACCESS_TABLE_', `',
+ `errprint(`*** ERROR: FEATURE(`bcc') requires FEATURE(`access_db')
+')')')
+
+ifdef(`_BCC_ACCESS_', `', `
+LOCAL_CONFIG
+Kbcctable ifelse(defn(`_ARG_'), `', DATABASE_MAP_TYPE MAIL_SETTINGS_DIR`bcctable', `_ARG_')')
+
+LOCAL_CONFIG
+O AddBcc=true
+ifelse(len(X`'_ARG2_),`1', `', `
+DA`'_ARG2_')
+
+ifelse(len(X`'_ARG4_), `1', `',
+`define(`_CANONIFY_BCC_', `1')dnl
+define(`_NEED_SMTPOPMODES_', `1')dnl
+# canonical address look up for AddBcc recipients
+KcanonicalRcpt _ARG4_
+')dnl
+
+LOCAL_RULESETS
+Sbcc
+R< $+ > $1
+ifdef(`_BCC_ACCESS_', `dnl
+R$+ @ $+ $: $1@$2 $| $>SearchList <! bcc> $| <D:$2> <>',
+`R$+ @ $+ $: $1@$2 $| $>BCC $2')
+R$* $| <?> $@
+R$* $| $* $: ifelse(len(X`'_ARG3_),`1', `$1', `_ARG3_')
+
+ifdef(`_CANONIFY_BCC_', `dnl
+R$+ @ $+ $: $1@$2 $| <$(canonicalRcpt $1 @ $2 $: $)>
+R$* $| <> $@
+R$* $| <$* <TMPF>> $#error $@ 4.3.0 $: "451 Temporary system failure. Please try again later."
+R$* $| <$+> $@ $2 map matched?
+')
+
+
+ifdef(`_BCC_ACCESS_', `', `
+SBCC
+R$+ $: $1 < $(bcctable $1 $: ? $) >
+R$- . $+ <?> $: $2 < $(bcctable .$2 $: ? $) >
+R$- . $+ <?> $: $>BCC $2
+R$* <$*> $: <$2>
+')
Modified: stable/0.8/contrib/sendmail/cf/feature/bestmx_is_local.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/bestmx_is_local.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/bestmx_is_local.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2000 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: bestmx_is_local.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: bestmx_is_local.m4,v 8.27 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_BESTMX_IS_LOCAL_', _ARG_)
Modified: stable/0.8/contrib/sendmail/cf/feature/bitdomain.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/bitdomain.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/bitdomain.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999, 2001-2002 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999, 2001-2002 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: bitdomain.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: bitdomain.m4,v 8.31 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_BITDOMAIN_TABLE_', `')
Modified: stable/0.8/contrib/sendmail/cf/feature/blacklist_recipients.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/blacklist_recipients.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/blacklist_recipients.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: blacklist_recipients.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: blacklist_recipients.m4,v 8.14 2013-11-22 20:51:11 ca Exp $')
divert(-1)
ifdef(`_ACCESS_TABLE_',
Modified: stable/0.8/contrib/sendmail/cf/feature/block_bad_helo.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/block_bad_helo.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/block_bad_helo.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2006 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2006 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,9 +10,11 @@
#
divert(0)dnl
-VERSIONID(`$Id: block_bad_helo.m4,v 1.1.1.1 2007-11-23 22:10:30 laffer1 Exp $')
+VERSIONID(`$Id: block_bad_helo.m4,v 1.2 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_BLOCK_BAD_HELO_', `')dnl
RELAY_DOMAIN(`127.0.0.1')dnl
+RELAY_DOMAIN(`IPv6:0:0:0:0:0:0:0:1 IPv6:::1')dnl
LOCAL_DOMAIN(`[127.0.0.1]')dnl
+LOCAL_DOMAIN(`[IPv6:0:0:0:0:0:0:0:1] [IPv6:::1]')dnl
Modified: stable/0.8/contrib/sendmail/cf/feature/compat_check.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/compat_check.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/compat_check.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000-2002 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
#
#
divert(0)
-VERSIONID(`$Id: compat_check.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: compat_check.m4,v 1.5 2013-11-22 20:51:11 ca Exp $')
divert(-1)
ifdef(`_ACCESS_TABLE_', `',
`errprint(`FEATURE(`compat_check') requires FEATURE(`access_db')
Modified: stable/0.8/contrib/sendmail/cf/feature/conncontrol.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/conncontrol.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/conncontrol.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2003, 2004 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2003, 2004 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: conncontrol.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: conncontrol.m4,v 1.5 2013-11-22 20:51:11 ca Exp $')
divert(-1)
ifdef(`_ACCESS_TABLE_', `
Modified: stable/0.8/contrib/sendmail/cf/feature/delay_checks.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/delay_checks.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/delay_checks.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1999-2000 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999-2000 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: delay_checks.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: delay_checks.m4,v 8.9 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_DELAY_CHECKS_', 1)
Modified: stable/0.8/contrib/sendmail/cf/feature/dnsbl.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/dnsbl.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/dnsbl.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998-2002, 2005-2007 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2002, 2005-2007 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -12,7 +12,7 @@
ifdef(`DNSBL_MAP', `', `define(`DNSBL_MAP', `dns -R A')')
divert(0)
ifdef(`_DNSBL_R_',`dnl',`dnl
-VERSIONID(`$Id: dnsbl.m4,v 1.1.1.4 2007-11-23 22:10:30 laffer1 Exp $')
+VERSIONID(`$Id: dnsbl.m4,v 8.34 2013-11-22 20:51:11 ca Exp $')
define(`_DNSBL_R_',`')
ifelse(defn(`_ARG_'), `',
`errprint(`*** ERROR: missing argument for FEATURE(`dnsbl')')')
Modified: stable/0.8/contrib/sendmail/cf/feature/domaintable.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/domaintable.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/domaintable.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999, 2001-2002 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999, 2001-2002 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: domaintable.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: domaintable.m4,v 8.25 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_DOMAIN_TABLE_', `')
Modified: stable/0.8/contrib/sendmail/cf/feature/enhdnsbl.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/enhdnsbl.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/enhdnsbl.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2000-2002, 2005-2007 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000-2002, 2005-2007 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -13,7 +13,7 @@
`errprint(`*** ERROR: missing argument for FEATURE(`enhdnsbl')')')
divert(0)
ifdef(`_EDNSBL_R_',`dnl',`dnl
-VERSIONID(`$Id: enhdnsbl.m4,v 1.1.1.4 2007-11-23 22:10:30 laffer1 Exp $')
+VERSIONID(`$Id: enhdnsbl.m4,v 1.13 2013-11-22 20:51:11 ca Exp $')
LOCAL_CONFIG
define(`_EDNSBL_R_',`')dnl
# map for enhanced DNS based blacklist lookups
Modified: stable/0.8/contrib/sendmail/cf/feature/generics_entire_domain.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/generics_entire_domain.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/generics_entire_domain.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: generics_entire_domain.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: generics_entire_domain.m4,v 8.2 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_GENERICS_ENTIRE_DOMAIN_', 1)
Modified: stable/0.8/contrib/sendmail/cf/feature/genericstable.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/genericstable.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/genericstable.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999, 2001-2002 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999, 2001-2002 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: genericstable.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: genericstable.m4,v 8.24 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_GENERICS_TABLE_', `')
Modified: stable/0.8/contrib/sendmail/cf/feature/greet_pause.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/greet_pause.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/greet_pause.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2004 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2004 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: greet_pause.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: greet_pause.m4,v 1.5 2013-11-22 20:51:11 ca Exp $')
divert(-1)
ifelse(len(X`'_ARG_),`1',`ifdef(`_ACCESS_TABLE_', `',
Modified: stable/0.8/contrib/sendmail/cf/feature/ldap_routing.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/ldap_routing.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/ldap_routing.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1999-2002, 2004, 2007 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999-2002, 2004, 2007 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: ldap_routing.m4,v 1.1.1.6 2013-08-14 22:35:47 laffer1 Exp $')
+VERSIONID(`$Id: ldap_routing.m4,v 8.21 2013-11-22 20:51:11 ca Exp $')
divert(-1)
# Check first two arguments. If they aren't set, may need to warn in proto.m4
@@ -35,6 +35,8 @@
_ARG6_, `tempfail', `define(`_LDAP_ROUTE_MAPTEMP_', `_TEMPFAIL_')',
_ARG6_, `queue', `define(`_LDAP_ROUTE_MAPTEMP_', `_QUEUE_')')
+define(`_NEED_SMTPOPMODES_', `1')
+
LOCAL_CONFIG
# LDAP routing maps
Kldapmh ifelse(len(X`'_ARG1_), `1',
Modified: stable/0.8/contrib/sendmail/cf/feature/limited_masquerade.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/limited_masquerade.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/limited_masquerade.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: limited_masquerade.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: limited_masquerade.m4,v 8.10 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_LIMITED_MASQUERADE_', 1)
Modified: stable/0.8/contrib/sendmail/cf/feature/local_lmtp.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/local_lmtp.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/local_lmtp.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998-2000, 2002 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2000, 2002 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: local_lmtp.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: local_lmtp.m4,v 8.18 2013-11-22 20:51:11 ca Exp $')
divert(-1)
ifdef(`_MAILER_local_',
Modified: stable/0.8/contrib/sendmail/cf/feature/local_no_masquerade.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/local_no_masquerade.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/local_no_masquerade.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2000 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
#
divert(0)
-VERSIONID(`$Id: local_no_masquerade.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: local_no_masquerade.m4,v 1.3 2013-11-22 20:51:11 ca Exp $')
divert(-1)
ifdef(`_MAILER_local_',
Modified: stable/0.8/contrib/sendmail/cf/feature/local_procmail.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/local_procmail.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/local_procmail.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999, 2002 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999, 2002 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1994 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: local_procmail.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: local_procmail.m4,v 8.23 2013-11-22 20:51:11 ca Exp $')
divert(-1)
ifdef(`_MAILER_local_',
Modified: stable/0.8/contrib/sendmail/cf/feature/lookupdotdomain.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/lookupdotdomain.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/lookupdotdomain.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2000 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: lookupdotdomain.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: lookupdotdomain.m4,v 1.2 2013-11-22 20:51:11 ca Exp $')
divert(-1)
ifdef(`_ACCESS_TABLE_',
Modified: stable/0.8/contrib/sendmail/cf/feature/loose_relay_check.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/loose_relay_check.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/loose_relay_check.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: loose_relay_check.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: loose_relay_check.m4,v 8.7 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_LOOSE_RELAY_CHECK_', 1)
Modified: stable/0.8/contrib/sendmail/cf/feature/mailertable.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/mailertable.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/mailertable.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999, 2001-2002 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999, 2001-2002 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: mailertable.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: mailertable.m4,v 8.26 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_MAILER_TABLE_', `')
Modified: stable/0.8/contrib/sendmail/cf/feature/masquerade_entire_domain.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/masquerade_entire_domain.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/masquerade_entire_domain.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: masquerade_entire_domain.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: masquerade_entire_domain.m4,v 8.10 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_MASQUERADE_ENTIRE_DOMAIN_', 1)
Modified: stable/0.8/contrib/sendmail/cf/feature/masquerade_envelope.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/masquerade_envelope.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/masquerade_envelope.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: masquerade_envelope.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: masquerade_envelope.m4,v 8.10 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_MASQUERADE_ENVELOPE_', 1)
Modified: stable/0.8/contrib/sendmail/cf/feature/msp.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/msp.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/msp.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2000-2002, 2004 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000-2002, 2004 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: msp.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: msp.m4,v 1.34 2013-11-22 20:51:11 ca Exp $')
divert(-1)
undefine(`ALIAS_FILE')
define(`confDELIVERY_MODE', `i')
Modified: stable/0.8/contrib/sendmail/cf/feature/mtamark.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/mtamark.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/mtamark.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2004, 2005 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2004, 2005 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -11,7 +11,7 @@
divert(0)
ifdef(`_MTAMARK_R',`dnl',`dnl
-VERSIONID(`$Id: mtamark.m4,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $')
+VERSIONID(`$Id: mtamark.m4,v 1.3 2013-11-22 20:51:11 ca Exp $')
LOCAL_CONFIG
define(`_MTAMARK_R',`')dnl
# map for MTA mark
Modified: stable/0.8/contrib/sendmail/cf/feature/no_default_msa.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/no_default_msa.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/no_default_msa.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1999-2000 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999-2000 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: no_default_msa.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: no_default_msa.m4,v 8.3 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_NO_MSA_', `1')
Modified: stable/0.8/contrib/sendmail/cf/feature/nocanonify.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/nocanonify.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/nocanonify.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: nocanonify.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: nocanonify.m4,v 8.13 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_NO_CANONIFY_', 1)
Copied: stable/0.8/contrib/sendmail/cf/feature/nopercenthack.m4 (from rev 9097, trunk/contrib/sendmail/cf/feature/nopercenthack.m4)
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/nopercenthack.m4 (rev 0)
+++ stable/0.8/contrib/sendmail/cf/feature/nopercenthack.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -0,0 +1,27 @@
+divert(-1)
+#
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
+# All rights reserved.
+# Copyright (c) 1983 Eric P. Allman. All rights reserved.
+# Copyright (c) 1988, 1993
+# The Regents of the University of California. All rights reserved.
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the sendmail distribution.
+#
+#
+
+divert(0)
+VERSIONID(`$Id: nopercenthack.m4,v 8.14 2013/01/31 15:07:00 ca Exp $')
+divert(-1)
+
+ifelse(defn(`_ARG_'), `',
+ `errprint(`*** ERROR: missing argument for FEATURE(nopercenthack):
+ use `reject' or `nospecial'. See cf/README.
+')define(`_NO_PERCENTHACK_', `e')',
+ substr(_ARG_,0,1), `r', `define(`_NO_PERCENTHACK_', `r')',
+ substr(_ARG_,0,1), `n', `define(`_NO_PERCENTHACK_', `n')',
+ `errprint(`*** ERROR: illegal argument _ARG_ for FEATURE(nopercenthack)
+')
+ ')
Modified: stable/0.8/contrib/sendmail/cf/feature/notsticky.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/notsticky.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/notsticky.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: notsticky.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: notsticky.m4,v 8.12 2013-11-22 20:51:11 ca Exp $')
#
# This is now the default. Use ``FEATURE(stickyhost)'' if you want
# the old default behaviour.
Modified: stable/0.8/contrib/sendmail/cf/feature/nouucp.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/nouucp.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/nouucp.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: nouucp.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: nouucp.m4,v 8.14 2013-11-22 20:51:11 ca Exp $')
divert(-1)
ifelse(defn(`_ARG_'), `',
Modified: stable/0.8/contrib/sendmail/cf/feature/nullclient.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/nullclient.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/nullclient.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2000 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -22,7 +22,7 @@
#
divert(0)
-VERSIONID(`$Id: nullclient.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: nullclient.m4,v 8.25 2013-11-22 20:51:11 ca Exp $')
divert(-1)
undefine(`ALIAS_FILE')
Copied: stable/0.8/contrib/sendmail/cf/feature/prefixmod.m4 (from rev 9097, trunk/contrib/sendmail/cf/feature/prefixmod.m4)
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/prefixmod.m4 (rev 0)
+++ stable/0.8/contrib/sendmail/cf/feature/prefixmod.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -0,0 +1,24 @@
+divert(-1)
+#
+# Copyright (c) 2014 Proofpoint, Inc. and its suppliers.
+# All rights reserved.
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the sendmail distribution.
+#
+#
+
+divert(-1)
+# Arguments:
+# 1: prefix to match; must be one or more tokens
+# (this is not a "substring" match)
+# 2: flags to set
+# NYI: 3: replacement for 1 (empty for now)
+
+ifelse(defn(`_ARG_'), `', `errprint(`Feature "prefixmod" requires argument')',
+ `define(`_PREFIX_MOD_', _ARG_)')
+ifelse(len(X`'_ARG2_),`1', `errprint(`Feature "prefixmod" requires two arguments')',
+ `define(`_PREFIX_FLAGS_', _ARG2_)')
+
+define(`_NEED_MACRO_MAP_', `1')
Modified: stable/0.8/contrib/sendmail/cf/feature/preserve_local_plus_detail.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/preserve_local_plus_detail.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/preserve_local_plus_detail.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2000 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: preserve_local_plus_detail.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: preserve_local_plus_detail.m4,v 8.2 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_PRESERVE_LOCAL_PLUS_DETAIL_', `1')
Modified: stable/0.8/contrib/sendmail/cf/feature/preserve_luser_host.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/preserve_luser_host.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/preserve_luser_host.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2000, 2002 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000, 2002 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: preserve_luser_host.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: preserve_luser_host.m4,v 1.4 2013-11-22 20:51:11 ca Exp $')
divert(-1)
ifdef(`LUSER_RELAY', `',
Modified: stable/0.8/contrib/sendmail/cf/feature/promiscuous_relay.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/promiscuous_relay.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/promiscuous_relay.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998-1999, 2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-1999, 2001 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: promiscuous_relay.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: promiscuous_relay.m4,v 8.13 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_PROMISCUOUS_RELAY_', 1)
Modified: stable/0.8/contrib/sendmail/cf/feature/queuegroup.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/queuegroup.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/queuegroup.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: queuegroup.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: queuegroup.m4,v 1.5 2013-11-22 20:51:11 ca Exp $')
divert(-1)
ifdef(`_ACCESS_TABLE_', `',
Modified: stable/0.8/contrib/sendmail/cf/feature/ratecontrol.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/ratecontrol.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/ratecontrol.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2003, 2004 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2003, 2004 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: ratecontrol.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: ratecontrol.m4,v 1.6 2013-11-22 20:51:11 ca Exp $')
divert(-1)
ifdef(`_ACCESS_TABLE_', `
Modified: stable/0.8/contrib/sendmail/cf/feature/redirect.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/redirect.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/redirect.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: redirect.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: redirect.m4,v 8.16 2013-11-22 20:51:11 ca Exp $')
divert(-1)
LOCAL_RULE_0
Modified: stable/0.8/contrib/sendmail/cf/feature/relay_based_on_MX.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/relay_based_on_MX.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/relay_based_on_MX.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: relay_based_on_MX.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: relay_based_on_MX.m4,v 8.12 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_RELAY_MX_SERVED_', 1)
Modified: stable/0.8/contrib/sendmail/cf/feature/relay_entire_domain.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/relay_entire_domain.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/relay_entire_domain.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: relay_entire_domain.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: relay_entire_domain.m4,v 8.11 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_RELAY_ENTIRE_DOMAIN_', 1)
Modified: stable/0.8/contrib/sendmail/cf/feature/relay_hosts_only.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/relay_hosts_only.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/relay_hosts_only.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: relay_hosts_only.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: relay_hosts_only.m4,v 8.11 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_RELAY_HOSTS_ONLY_', 1)
Modified: stable/0.8/contrib/sendmail/cf/feature/relay_local_from.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/relay_local_from.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/relay_local_from.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998-1999, 2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-1999, 2001 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: relay_local_from.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: relay_local_from.m4,v 8.7 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_RELAY_LOCAL_FROM_', 1)
Modified: stable/0.8/contrib/sendmail/cf/feature/relay_mail_from.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/relay_mail_from.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/relay_mail_from.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1999, 2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999, 2001 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: relay_mail_from.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: relay_mail_from.m4,v 8.4 2013-11-22 20:51:11 ca Exp $')
divert(-1)
ifdef(`_ACCESS_TABLE_',
Modified: stable/0.8/contrib/sendmail/cf/feature/require_rdns.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/require_rdns.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/require_rdns.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2006 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2006 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: require_rdns.m4,v 1.1.1.1 2007-11-23 22:10:30 laffer1 Exp $')
+VERSIONID(`$Id: require_rdns.m4,v 1.2 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_REQUIRE_RDNS_', `')
Modified: stable/0.8/contrib/sendmail/cf/feature/smrsh.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/smrsh.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/smrsh.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: smrsh.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: smrsh.m4,v 8.15 2013-11-22 20:51:11 ca Exp $')
divert(-1)
ifdef(`_MAILER_local_',
Modified: stable/0.8/contrib/sendmail/cf/feature/stickyhost.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/stickyhost.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/stickyhost.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: stickyhost.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: stickyhost.m4,v 8.10 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_STICKY_LOCAL_DOMAIN_', 1)
Copied: stable/0.8/contrib/sendmail/cf/feature/tls_session_features.m4 (from rev 9097, trunk/contrib/sendmail/cf/feature/tls_session_features.m4)
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/tls_session_features.m4 (rev 0)
+++ stable/0.8/contrib/sendmail/cf/feature/tls_session_features.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -0,0 +1,16 @@
+divert(-1)
+#
+# Copyright (c) 2015 Proofpoint, Inc. and its suppliers.
+# All rights reserved.
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the sendmail distribution.
+#
+#
+
+divert(0)
+VERSIONID(`$Id: tls_session_features.m4,v 8.1 2015-02-25 20:51:11 ca Exp $')
+divert(-1)
+
+define(`_TLS_SESSION_FEATURES_', 1)
Modified: stable/0.8/contrib/sendmail/cf/feature/use_client_ptr.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/use_client_ptr.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/use_client_ptr.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2004 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2004 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: use_client_ptr.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: use_client_ptr.m4,v 1.2 2013-11-22 20:51:11 ca Exp $')
divert(-1)
# if defined, check_relay will use {client_ptr} instead of whatever
Modified: stable/0.8/contrib/sendmail/cf/feature/use_ct_file.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/use_ct_file.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/use_ct_file.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999, 2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999, 2001 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: use_ct_file.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: use_ct_file.m4,v 8.12 2013-11-22 20:51:11 ca Exp $')
divert(-1)
# if defined, the sendmail.cf will read the /etc/mail/trusted-users file to
Modified: stable/0.8/contrib/sendmail/cf/feature/use_cw_file.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/use_cw_file.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/use_cw_file.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999, 2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999, 2001 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: use_cw_file.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: use_cw_file.m4,v 8.12 2013-11-22 20:51:11 ca Exp $')
divert(-1)
# if defined, the sendmail.cf will read the /etc/mail/local-host-names file
Modified: stable/0.8/contrib/sendmail/cf/feature/uucpdomain.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/uucpdomain.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/uucpdomain.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999, 2001-2002 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999, 2001-2002 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: uucpdomain.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: uucpdomain.m4,v 8.30 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_UUDOMAIN_TABLE_', `')
Modified: stable/0.8/contrib/sendmail/cf/feature/virtuser_entire_domain.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/virtuser_entire_domain.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/virtuser_entire_domain.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: virtuser_entire_domain.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: virtuser_entire_domain.m4,v 8.3 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_VIRTUSER_ENTIRE_DOMAIN_', 1)
Modified: stable/0.8/contrib/sendmail/cf/feature/virtusertable.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/feature/virtusertable.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/feature/virtusertable.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999, 2001-2002 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999, 2001-2002 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: virtusertable.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: virtusertable.m4,v 8.24 2013-11-22 20:51:11 ca Exp $')
divert(-1)
define(`_VIRTUSER_TABLE_', `')
Modified: stable/0.8/contrib/sendmail/cf/hack/cssubdomain.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/hack/cssubdomain.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/hack/cssubdomain.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -12,7 +12,7 @@
#
#
divert(0)
-VERSIONID(`$Id: cssubdomain.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: cssubdomain.m4,v 8.10 2013-11-22 20:51:13 ca Exp $')
divert(2)
# find possible (old & new) versions of our name via short circuit hack
Copied: stable/0.8/contrib/sendmail/cf/hack/xconnect.m4 (from rev 9097, trunk/contrib/sendmail/cf/hack/xconnect.m4)
===================================================================
--- stable/0.8/contrib/sendmail/cf/hack/xconnect.m4 (rev 0)
+++ stable/0.8/contrib/sendmail/cf/hack/xconnect.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -0,0 +1,37 @@
+divert(-1)
+#
+# Copyright (c) 1998-2011 Proofpoint, Inc. and its suppliers.
+# All rights reserved.
+# Copyright (c) 1983 Eric P. Allman. All rights reserved.
+# Copyright (c) 1988, 1993
+# The Regents of the University of California. All rights reserved.
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the sendmail distribution.
+#
+
+divert(0)
+VERSIONID(`$Id: xconnect.m4,v 1.3 2013-11-22 20:51:13 ca Exp $')
+divert(-1)
+
+ifdef(`_ACCESS_TABLE_', `dnl
+LOCAL_RULESETS
+#
+# x_connect ruleset for looking up XConnect: tag in access DB to enable
+# XCONNECT support in MTA
+#
+Sx_connect
+dnl workspace: {client_name} $| {client_addr}
+R$+ $| $+ $: $>D < $1 > <?> <! XConnect> < $2 >
+dnl workspace: <result-of-lookup> <{client_addr}>
+dnl OR $| $+ if client_name is empty
+R $| $+ $: $>A < $1 > <?> <! XConnect> <> empty client_name
+dnl workspace: <result-of-lookup> <{client_addr}>
+R<?> <$+> $: $>A < $1 > <?> <! XConnect> <> no: another lookup
+dnl workspace: <result-of-lookup> (<>|<{client_addr}>)
+R<?> <$*> $# no found nothing
+dnl workspace: <result-of-lookup> (<>|<{client_addr}>) | OK
+R<$+> <$*> $@ yes found in access DB',
+ `errprint(`*** ERROR: HACK(xconnect) requires FEATURE(access_db)
+')')
Modified: stable/0.8/contrib/sendmail/cf/m4/cf.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/m4/cf.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/m4/cf.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983, 1995 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -26,4 +26,4 @@
divert(0)dnl
ifdef(`OSTYPE', `dnl',
`include(_CF_DIR_`'m4/cfhead.m4)dnl
-VERSIONID(`$Id: cf.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')')
+VERSIONID(`$Id: cf.m4,v 8.33 2013-11-22 20:51:13 ca Exp $')')
Modified: stable/0.8/contrib/sendmail/cf/m4/cfhead.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/m4/cfhead.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/m4/cfhead.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1998-2004, 2009, 2010 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2004, 2009, 2010 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983, 1995 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -16,7 +16,7 @@
#####
##### SENDMAIL CONFIGURATION FILE
#####
-ifdef(`__win32__', `dnl', `dnl
+ifdef(`_NO_MAKEINFO_', `dnl', `dnl
ifdef(`TEMPFILE', `dnl', `define(`TEMPFILE', maketemp(/tmp/cfXXXXXX))dnl
syscmd(sh _CF_DIR_`'sh/makeinfo.sh _CF_DIR_ > TEMPFILE)dnl
include(TEMPFILE)dnl
@@ -307,4 +307,4 @@
divert(0)dnl
-VERSIONID(`$Id: cfhead.m4,v 1.1.1.5 2011-05-17 22:19:51 laffer1 Exp $')
+VERSIONID(`$Id: cfhead.m4,v 8.122 2013-11-22 20:51:13 ca Exp $')
Modified: stable/0.8/contrib/sendmail/cf/m4/proto.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/m4/proto.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/m4/proto.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998-2010 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2010 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983, 1995 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: proto.m4,v 1.1.1.8 2013-08-14 22:35:47 laffer1 Exp $')
+VERSIONID(`$Id: proto.m4,v 8.762 2013-11-22 20:51:13 ca Exp $')
# level CF_LEVEL config file format
V`'CF_LEVEL`'ifdef(`NO_VENDOR',`', `/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Berkeley')')
@@ -149,7 +149,7 @@
`dnl')
# operators that cannot be in local usernames (i.e., network indicators)
-CO @ % ifdef(`_NO_UUCP_', `', `!')
+CO @ ifdef(`_NO_PERCENTHACK_', `', `%') ifdef(`_NO_UUCP_', `', `!')
# a class with just dot (for identifying canonical names)
C..
@@ -326,6 +326,9 @@
# use Errors-To: header?
_OPTION(UseErrorsTo, `confUSE_ERRORS_TO', `False')
+# use compressed IPv6 address format?
+_OPTION(UseCompressedIPv6Addresses, `confUSE_COMPRESSED_IPV6_ADDRESSES', `')
+
# log level
_OPTION(LogLevel, `confLOG_LEVEL', `10')
@@ -387,6 +390,9 @@
# minimum time in queue before retry
_OPTION(MinQueueAge, `confMIN_QUEUE_AGE', `30m')
+# maximum time in queue before retry (if > 0; only for exponential delay)
+_OPTION(MaxQueueAge, `confMAX_QUEUE_AGE', `')
+
# how many jobs can you process in the queue?
_OPTION(MaxQueueRunSize, `confMAX_QUEUE_RUN_SIZE', `0')
@@ -641,6 +647,12 @@
# SMTP STARTTLS server options
_OPTION(TLSSrvOptions, `confTLS_SRV_OPTIONS', `')
+# SSL cipherlist
+_OPTION(CipherList, `confCIPHER_LIST', `')
+# server side SSL options
+_OPTION(ServerSSLOptions, `confSERVER_SSL_OPTIONS', `')
+# client side SSL options
+_OPTION(ClientSSLOptions, `confCLIENT_SSL_OPTIONS', `')
# Input mail filters
_OPTION(InputMailFilters, `confINPUT_MAIL_FILTERS', `')
@@ -674,6 +686,8 @@
_OPTION(DHParameters, `confDH_PARAMETERS', `')
# Random data source (required for systems without /dev/urandom under OpenSSL)
_OPTION(RandFile, `confRAND_FILE', `')
+# fingerprint algorithm (digest) to use for the presented cert
+_OPTION(CertFingerprintAlgorithm, `confCERT_FINGERPRINT_ALGORITHM', `')
# Maximum number of "useless" commands before slowing down
_OPTION(MaxNOOPCommands, `confMAX_NOOP_COMMANDS', `20')
@@ -681,6 +695,10 @@
# Name to use for EHLO (defaults to $j)
_OPTION(HeloName, `confHELO_NAME')
+ifdef(`_NEED_SMTPOPMODES_', `dnl
+# SMTP operation modes
+C{SMTPOpModes} s d D')
+
############################
`# QUEUE GROUP DEFINITIONS #'
############################
@@ -808,9 +826,11 @@
R$- . $- :: $+ $@ $>Canonify2 $3 < @ $1.$2 .DECNET > numeric DECnet addr
',
`dnl')
-# if we have % signs, take the rightmost one
+ifdef(`_NO_PERCENTHACK_', `dnl',
+`# if we have % signs, take the rightmost one
R$* % $* $1 @ $2 First make them all @s.
R$* @ $* @ $* $1 % $2 @ $3 Undo all but the last.
+')
R$* @ $* $@ $>Canonify2 $1 < @ $2 > Insert < > and finish
# else we must be a local name
@@ -1036,6 +1056,13 @@
$@ $>Parse0 $>canonify $1 $2 $3 ...@*LOCAL* -> ...
R$* < @ *LOCAL* > $: $1
+ifdef(`_ADD_BCC_', `dnl
+R$+ $: $>ParseBcc $1', `dnl')
+ifdef(`_PREFIX_MOD_', `dnl
+dnl do this only for addr_type=e r?
+R _PREFIX_MOD_ $+ $: $1 $(macro {rcpt_flags} $@ _PREFIX_FLAGS_ $)
+')dnl
+
#
# Parse1 -- the bottom half of ruleset 0.
#
@@ -1198,6 +1225,13 @@
R$=L $#_LOCAL_ $: @ $1 special local names
R$+ $#_LOCAL_ $: $1 regular local names
+ifdef(`_ADD_BCC_', `dnl
+SParseBcc
+R$+ $: $&{addr_type} $| $&A $| $1
+Re b $| $+ $| $+ $>MailerToTriple < $1 > $2 copy?
+R$* $| $* $| $+ $@ $3 no copy
+')
+
###########################################################################
### Ruleset 5 -- special rewriting after aliases have been expanded ###
###########################################################################
@@ -1457,9 +1491,6 @@
### Parsed address (user < @ domain . >)
######################################################################
-# SMTP operation modes
-C{SMTPOpModes} s d D
-
SLDAPExpand
# do the LDAP lookups
R<$+><$+><$*> $: <$(ldapmra $2 $: $)> <$(ldapmh $2 $: $)> <$1> <$2> <$3>
@@ -1861,6 +1892,10 @@
R<@> < $* @ localhost > $: < ? $&{client_name} > < $1 @ localhost >
R<@> < $* @ [127.0.0.1] >
$: < ? $&{client_name} > < $1 @ [127.0.0.1] >
+R<@> < $* @ [IPv6:0:0:0:0:0:0:0:1] >
+ $: < ? $&{client_name} > < $1 @ [IPv6:0:0:0:0:0:0:0:1] >
+R<@> < $* @ [IPv6:::1] >
+ $: < ? $&{client_name} > < $1 @ [IPv6:::1] >
R<@> < $* @ localhost.$m >
$: < ? $&{client_name} > < $1 @ localhost.$m >
ifdef(`_NO_UUCP_', `dnl',
@@ -2137,6 +2172,9 @@
ifelse(defn(`_NO_UUCP_'), `r',
`R$* ! $* < @ $* > $: <REMOTE> $2 < @ BANG_PATH >
R$* ! $* $: <REMOTE> $2 < @ BANG_PATH >', `dnl')
+ifelse(defn(`_NO_PERCENTHACK_'), `r',
+`R$* % $* < @ $* > $: <REMOTE> $1 < @ PERCENT_HACK >
+R$* % $* $: <REMOTE> $1 < @ PERCENT_HACK >', `dnl')
# anything terminating locally is ok
ifdef(`_RELAY_ENTIRE_DOMAIN_', `dnl
R$+ < @ $* $=m > $@ RELAY', `dnl')
@@ -2217,6 +2255,8 @@
R$@ $@ RELAY originated locally
R0 $@ RELAY originated locally
R127.0.0.1 $@ RELAY originated locally
+RIPv6:0:0:0:0:0:0:0:1 $@ RELAY originated locally
+dnl if compiled with IPV6_FULL=0
RIPv6:::1 $@ RELAY originated locally
R$=R $* $@ RELAY relayable IP address
ifdef(`_ACCESS_TABLE_', `dnl
@@ -2395,6 +2435,8 @@
R$* $| <$*> [$=w] $#error $@ 5.7.1 $:"550 bogus HELO name used: " $&s
dnl Pass anything else with a "." in the domain parameter
R$* $| <$*> [$+.$+] $: $1 qualified domain ok
+dnl Pass IPv6: address literals
+R$* $| <$*> [IPv6:$+] $: $1 qualified domain ok
dnl Reject if there was no "." or only an initial or final "."
R$* $| <$*> [$*] $#error $@ 5.7.1 $:"550 bogus HELO name used: " $&s
dnl Clean up the workspace
@@ -2887,6 +2929,26 @@
dnl endif _ACCESS_TABLE_
divert(0)
+ifdef(`_TLS_SESSION_FEATURES_', `dnl
+Stls_srv_features
+ifdef(`_ACCESS_TABLE_', `dnl
+R$* $| $* $: $>D <$1> <?> <! TLS_Srv_Features> <$2>
+R<?> <$*> $: $>A <$1> <?> <! TLS_Srv_Features> <$1>
+R<?> <$*> $@ ""
+R<$+> <$*> $@ $1
+', `dnl
+R$* $@ ""')
+
+Stls_clt_features
+ifdef(`_ACCESS_TABLE_', `dnl
+R$* $| $* $: $>D <$1> <?> <! TLS_Clt_Features> <$2>
+R<?> <$*> $: $>A <$1> <?> <! TLS_Clt_Features> <$1>
+R<?> <$*> $@ ""
+R<$+> <$*> $@ $1
+', `dnl
+R$* $@ ""')
+')
+
######################################################################
### RelayTLS: allow relaying based on TLS authentication
###
Modified: stable/0.8/contrib/sendmail/cf/m4/version.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/m4/version.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/m4/version.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998-2013 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2015 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -11,8 +11,8 @@
# the sendmail distribution.
#
#
-VERSIONID(`$Id: version.m4,v 1.1.1.9 2013-08-14 22:35:47 laffer1 Exp $')
+VERSIONID(`$Id: version.m4,v 8.237 2014-01-27 12:55:17 ca Exp $')
#
divert(0)
# Configuration version number
-DZ8.14.7`'ifdef(`confCF_VERSION', `/confCF_VERSION')
+DZ8.15.2`'ifdef(`confCF_VERSION', `/confCF_VERSION')
Modified: stable/0.8/contrib/sendmail/cf/mailer/cyrus.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/mailer/cyrus.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/mailer/cyrus.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
PUSHDIVERT(-1)
#
-# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2001 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -49,7 +49,7 @@
### Cyrus Mailer specification ###
##################################################
-VERSIONID(`$Id: cyrus.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $ (Carnegie Mellon)')
+VERSIONID(`$Id: cyrus.m4,v 8.24 2013-11-22 20:51:14 ca Exp $ (Carnegie Mellon)')
Mcyrus, P=CYRUS_MAILER_PATH, F=_MODMF_(CONCAT(`lsDFMnPq', CYRUS_MAILER_FLAGS), `CYRUS'), S=EnvFromL, R=EnvToL/HdrToL,
ifdef(`CYRUS_MAILER_MAX', `M=CYRUS_MAILER_MAX, ')U=CYRUS_MAILER_USER, T=DNS/RFC822/X-Unix,_CYRUS_QGRP
Modified: stable/0.8/contrib/sendmail/cf/mailer/cyrusv2.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/mailer/cyrusv2.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/mailer/cyrusv2.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
PUSHDIVERT(-1)
#
-# Copyright (c) 2002 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2002 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -21,7 +21,7 @@
### Cyrus V2 Mailer specification ###
#########################################
-VERSIONID(`$Id: cyrusv2.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: cyrusv2.m4,v 1.2 2013-11-22 20:51:14 ca Exp $')
Mcyrusv2, P=[IPC], F=_MODMF_(CONCAT(_DEF_CYRUSV2_MAILER_FLAGS, CYRUSV2_MAILER_FLAGS), `CYRUSV2'),
S=EnvFromSMTP/HdrFromL, R=EnvToL/HdrToL, E=\r\n,
Modified: stable/0.8/contrib/sendmail/cf/mailer/fax.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/mailer/fax.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/mailer/fax.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
PUSHDIVERT(-1)
#
-# Copyright (c) 1998, 1999, 2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999, 2001 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -28,7 +28,7 @@
### FAX Mailer specification ###
####################################
-VERSIONID(`$Id: fax.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: fax.m4,v 8.17 2013-11-22 20:51:14 ca Exp $')
Mfax, P=FAX_MAILER_PATH, F=DFMhu, S=14, R=24,
M=FAX_MAILER_MAX, T=X-Phone/X-FAX/X-Unix,_FAX_QGRP
Modified: stable/0.8/contrib/sendmail/cf/mailer/local.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/mailer/local.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/mailer/local.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
PUSHDIVERT(-1)
#
-# Copyright (c) 1998-2000, 2004 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2000, 2004 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -32,7 +32,7 @@
### Local and Program Mailer specification ###
##################################################
-VERSIONID(`$Id: local.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: local.m4,v 8.60 2013-11-22 20:51:14 ca Exp $')
#
# Envelope sender rewriting
Modified: stable/0.8/contrib/sendmail/cf/mailer/mail11.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/mailer/mail11.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/mailer/mail11.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
PUSHDIVERT(-1)
#
-# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2001 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -42,7 +42,7 @@
### UTK-MAIL11 Mailer specification ###
###########################################
-VERSIONID(`$Id: mail11.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: mail11.m4,v 8.23 2013-11-22 20:51:14 ca Exp $')
SMail11To
R$+ < @ $- .UUCP > $: $2 ! $1 back to old style
Modified: stable/0.8/contrib/sendmail/cf/mailer/phquery.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/mailer/phquery.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/mailer/phquery.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
PUSHDIVERT(-1)
#
-# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2001 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -25,7 +25,7 @@
### PH Mailer specification ###
####################################
-VERSIONID(`$Id: phquery.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: phquery.m4,v 8.18 2013-11-22 20:51:14 ca Exp $')
Mph, P=PH_MAILER_PATH, F=_MODMF_(CONCAT(`nrDFM', PH_MAILER_FLAGS), `PH'), S=EnvFromL, R=EnvToL/HdrToL,
T=DNS/RFC822/X-Unix,_PH_QGRP
Modified: stable/0.8/contrib/sendmail/cf/mailer/pop.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/mailer/pop.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/mailer/pop.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
PUSHDIVERT(-1)
#
-# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2001 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -23,7 +23,7 @@
### POP Mailer specification ###
####################################
-VERSIONID(`$Id: pop.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: pop.m4,v 8.23 2013-11-22 20:51:14 ca Exp $')
Mpop, P=POP_MAILER_PATH, F=_MODMF_(CONCAT(`lsDFMq', POP_MAILER_FLAGS), `POP'), S=EnvFromL, R=EnvToL/HdrToL,
T=DNS/RFC822/X-Unix,_POP_QGRP
Modified: stable/0.8/contrib/sendmail/cf/mailer/procmail.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/mailer/procmail.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/mailer/procmail.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
PUSHDIVERT(-1)
#
-# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2001 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -27,7 +27,7 @@
### PROCMAIL Mailer specification ###
##################*****##################
-VERSIONID(`$Id: procmail.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: procmail.m4,v 8.23 2013-11-22 20:51:14 ca Exp $')
Mprocmail, P=PROCMAIL_MAILER_PATH, F=_MODMF_(CONCAT(`DFM', PROCMAIL_MAILER_FLAGS), `PROCMAIL'), S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP/HdrFromSMTP,
ifdef(`PROCMAIL_MAILER_MAX', `M=PROCMAIL_MAILER_MAX, ')T=DNS/RFC822/X-Unix,_PROCMAIL_QGRP
Modified: stable/0.8/contrib/sendmail/cf/mailer/qpage.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/mailer/qpage.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/mailer/qpage.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -3,7 +3,7 @@
# Copyright (C) 1997, Philip A. Prindeville and Enteka Enterprise Technology
# Services
#
-# Copyright (c) 1999, 2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999, 2001 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -24,7 +24,7 @@
### QPAGE Mailer specification ###
######################################
-VERSIONID(`$Id: qpage.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: qpage.m4,v 8.11 2013-11-22 20:51:14 ca Exp $')
Mqpage, P=QPAGE_MAILER_PATH, F=_MODMF_(QPAGE_MAILER_FLAGS, `QPAGE'),
M=QPAGE_MAILER_MAX, T=DNS/RFC822/X-Unix,_QPAGE_QGRP
Modified: stable/0.8/contrib/sendmail/cf/mailer/smtp.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/mailer/smtp.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/mailer/smtp.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
PUSHDIVERT(-1)
#
-# Copyright (c) 1998-2001, 2006 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2001, 2006 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -31,7 +31,7 @@
### SMTP Mailer specification ###
#####################################
-VERSIONID(`$Id: smtp.m4,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $')
+VERSIONID(`$Id: smtp.m4,v 8.66 2013-11-22 20:51:14 ca Exp $')
#
# common sender and masquerading recipient rewriting
Modified: stable/0.8/contrib/sendmail/cf/mailer/usenet.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/mailer/usenet.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/mailer/usenet.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
PUSHDIVERT(-1)
#
-# Copyright (c) 1998-2000, 2003 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2000, 2003 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -21,7 +21,7 @@
### USENET Mailer specification ###
####################################
-VERSIONID(`$Id: usenet.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: usenet.m4,v 8.23 2013-11-22 20:51:14 ca Exp $')
Musenet, P=USENET_MAILER_PATH, F=_MODMF_(USENET_MAILER_FLAGS, `USENET'), S=EnvFromL, R=EnvToL,
_OPTINS(`USENET_MAILER_MAX', `M=', `, ')T=X-Usenet/X-Usenet/X-Unix,_USENET_QGRP
Modified: stable/0.8/contrib/sendmail/cf/mailer/uucp.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/mailer/uucp.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/mailer/uucp.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
PUSHDIVERT(-1)
#
-# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2001 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -24,7 +24,7 @@
### UUCP Mailer specification ###
#####################################
-VERSIONID(`$Id: uucp.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: uucp.m4,v 8.45 2013-11-22 20:51:14 ca Exp $')
#
# envelope and header sender rewriting
Modified: stable/0.8/contrib/sendmail/cf/ostype/a-ux.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/a-ux.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/a-ux.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999, 2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999, 2001 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: a-ux.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: a-ux.m4,v 8.3 2013-11-22 20:51:15 ca Exp $')
ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /usr/spool/mqueue)')dnl
ifdef(`UUCP_MAILER_PATH',, `define(`UUCP_MAILER_PATH', /usr/bin/uux)')dnl
_DEFIFNOT(`LOCAL_MAILER_FLAGS', `mn9')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/aix3.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/aix3.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/aix3.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: aix3.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: aix3.m4,v 8.17 2013-11-22 20:51:15 ca Exp $')
ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /bin/bellmail)')dnl
ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', mail $u)')dnl
_DEFIFNOT(`LOCAL_MAILER_FLAGS', `mn9')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/aix4.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/aix4.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/aix4.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1996 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: aix4.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: aix4.m4,v 8.12 2013-11-22 20:51:15 ca Exp $')
ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /bin/bellmail)')dnl
ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', mail -F $g $u)')dnl
_DEFIFNOT(`LOCAL_MAILER_FLAGS', `mn9')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/aix5.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/aix5.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/aix5.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2000 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: aix5.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: aix5.m4,v 1.2 2013-11-22 20:51:15 ca Exp $')
ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /bin/bellmail)')dnl
ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', mail -F $g $u)')dnl
_DEFIFNOT(`LOCAL_MAILER_FLAGS', `mn9')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/altos.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/altos.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/altos.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1996 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -15,7 +15,7 @@
#
divert(0)
-VERSIONID(`$Id: altos.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: altos.m4,v 8.16 2013-11-22 20:51:15 ca Exp $')
ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /usr/spool/mqueue)')dnl
ifdef(`UUCP_MAILER_PATH',, `define(`UUCP_MAILER_PATH', /usr/bin/uux)')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/amdahl-uts.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/amdahl-uts.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/amdahl-uts.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: amdahl-uts.m4,v 1.1.1.2 2006-02-25 02:33:54 laffer1 Exp $')
+VERSIONID(`$Id: amdahl-uts.m4,v 8.17 2013-11-22 20:51:15 ca Exp $')
divert(-1)
_DEFIFNOT(`LOCAL_MAILER_FLAGS', `fSn9')
Modified: stable/0.8/contrib/sendmail/cf/ostype/bsd4.3.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/bsd4.3.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/bsd4.3.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,6 +13,6 @@
#
divert(0)
-VERSIONID(`$Id: bsd4.3.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: bsd4.3.m4,v 8.13 2013-11-22 20:51:15 ca Exp $')
ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /usr/spool/mqueue)')dnl
ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -z -a$g $h!rmail ($u)')')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/bsd4.4.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/bsd4.4.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/bsd4.4.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -14,7 +14,7 @@
#
divert(0)
-VERSIONID(`$Id: bsd4.4.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: bsd4.4.m4,v 8.15 2013-11-22 20:51:15 ca Exp $')
ifdef(`STATUS_FILE',, `define(`STATUS_FILE', `/var/log/sendmail.st')')dnl
ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /usr/libexec/mail.local)')dnl
ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -z -a$g $h!rmail ($u)')')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/bsdi.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/bsdi.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/bsdi.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,5 +13,5 @@
#
divert(0)
-VERSIONID(`$Id: bsdi.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: bsdi.m4,v 8.2 2013-11-22 20:51:15 ca Exp $')
include(_CF_DIR_`'ostype/bsd4.4.m4)dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/bsdi1.0.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/bsdi1.0.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/bsdi1.0.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,6 +13,6 @@
#
divert(0)
-VERSIONID(`$Id: bsdi1.0.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: bsdi1.0.m4,v 8.12 2013-11-22 20:51:15 ca Exp $')
errprint(`NOTE: OSTYPE(bsdi1.0) is deprecated. Use OSTYPE(bsdi) instead.')
include(_CF_DIR_`'ostype/bsdi.m4)dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/bsdi2.0.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/bsdi2.0.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/bsdi2.0.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,6 +13,6 @@
#
divert(0)
-VERSIONID(`$Id: bsdi2.0.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: bsdi2.0.m4,v 8.11 2013-11-22 20:51:15 ca Exp $')
errprint(`NOTE: OSTYPE(bsdi2.0) is deprecated. Use OSTYPE(bsdi) instead.')
include(_CF_DIR_`'ostype/bsdi.m4)dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/darwin.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/darwin.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/darwin.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2000, 2002 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000, 2002 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: darwin.m4,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $')
+VERSIONID(`$Id: darwin.m4,v 8.5 2013-11-22 20:51:15 ca Exp $')
ifdef(`STATUS_FILE',, `define(`STATUS_FILE', `/var/log/sendmail.st')')dnl
dnl turn on S flag for local mailer
MODIFY_MAILER_FLAGS(`LOCAL', `+S')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/dgux.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/dgux.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/dgux.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: dgux.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: dgux.m4,v 8.15 2013-11-22 20:51:15 ca Exp $')
_DEFIFNOT(`LOCAL_MAILER_FLAGS', `m9')dnl
define(`confTIME_ZONE', `USE_TZ')dnl
define(`confEBINDIR', `/usr/lib')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/domainos.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/domainos.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/domainos.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: domainos.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: domainos.m4,v 8.15 2013-11-22 20:51:15 ca Exp $')
divert(-1)
ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /usr/spool/mqueue)')
Modified: stable/0.8/contrib/sendmail/cf/ostype/dragonfly.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/dragonfly.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/dragonfly.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2001, 2004 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2001, 2004 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: dragonfly.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: dragonfly.m4,v 1.2 2013-11-22 20:51:15 ca Exp $')
ifdef(`STATUS_FILE',, `define(`STATUS_FILE', `/var/log/sendmail.st')')dnl
dnl turn on S flag for local mailer
MODIFY_MAILER_FLAGS(`LOCAL', `+S')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/dynix3.2.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/dynix3.2.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/dynix3.2.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,6 +13,6 @@
#
divert(0)
-VERSIONID(`$Id: dynix3.2.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: dynix3.2.m4,v 8.15 2013-11-22 20:51:15 ca Exp $')
ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /usr/spool/mqueue)')dnl
define(`confEBINDIR', `/usr/lib')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/freebsd4.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/freebsd4.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/freebsd4.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: freebsd4.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: freebsd4.m4,v 1.2 2013-11-22 20:51:15 ca Exp $')
ifdef(`STATUS_FILE',, `define(`STATUS_FILE', `/var/log/sendmail.st')')dnl
dnl turn on S flag for local mailer
MODIFY_MAILER_FLAGS(`LOCAL', `+S')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/freebsd5.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/freebsd5.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/freebsd5.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: freebsd5.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: freebsd5.m4,v 1.2 2013-11-22 20:51:15 ca Exp $')
ifdef(`STATUS_FILE',, `define(`STATUS_FILE', `/var/log/sendmail.st')')dnl
dnl turn on S flag for local mailer
MODIFY_MAILER_FLAGS(`LOCAL', `+S')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/freebsd6.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/freebsd6.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/freebsd6.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: freebsd6.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: freebsd6.m4,v 1.2 2013-11-22 20:51:15 ca Exp $')
ifdef(`STATUS_FILE',, `define(`STATUS_FILE', `/var/log/sendmail.st')')dnl
dnl turn on S flag for local mailer
MODIFY_MAILER_FLAGS(`LOCAL', `+S')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/gnu.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/gnu.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/gnu.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1997 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -14,7 +14,7 @@
#
divert(0)
-VERSIONID(`$Id: gnu.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: gnu.m4,v 8.14 2013-11-22 20:51:15 ca Exp $')
ifdef(`STATUS_FILE',, `define(`STATUS_FILE', `/var/log/sendmail.st')')dnl
ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /libexec/mail.local)')dnl
ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail $u')')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/hpux10.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/hpux10.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/hpux10.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: hpux10.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: hpux10.m4,v 8.20 2013-11-22 20:51:15 ca Exp $')
ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /var/spool/mqueue)')dnl
ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /usr/bin/rmail)')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/hpux11.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/hpux11.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/hpux11.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: hpux11.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: hpux11.m4,v 8.2 2013-11-22 20:51:15 ca Exp $')
ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /usr/bin/rmail)')dnl
_DEFIFNOT(`LOCAL_MAILER_FLAGS', `m9')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/hpux9.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/hpux9.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/hpux9.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: hpux9.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: hpux9.m4,v 8.25 2013-11-22 20:51:15 ca Exp $')
ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /usr/spool/mqueue)')dnl
ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', `/bin/rmail')')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/irix4.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/irix4.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/irix4.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: irix4.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: irix4.m4,v 8.20 2013-11-22 20:51:15 ca Exp $')
_DEFIFNOT(`LOCAL_MAILER_FLAGS', `Ehm9')dnl
ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /usr/spool/mqueue)')dnl
define(`confEBINDIR', `/usr/lib')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/irix5.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/irix5.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/irix5.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1995 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -29,7 +29,7 @@
#
divert(0)
-VERSIONID(`$Id: irix5.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: irix5.m4,v 8.17 2013-11-22 20:51:15 ca Exp $')
_DEFIFNOT(`LOCAL_MAILER_FLAGS', `Ehmu9')dnl
ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail -s -d $u')')dnl
ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /var/spool/mqueue)')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/irix6.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/irix6.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/irix6.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1995 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -29,7 +29,7 @@
#
divert(0)
-VERSIONID(`$Id: irix6.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: irix6.m4,v 8.15 2013-11-22 20:51:15 ca Exp $')
_DEFIFNOT(`LOCAL_MAILER_FLAGS', `Ehmu9')dnl
ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail -s -d $u')')dnl
ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /var/spool/mqueue)')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/isc4.1.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/isc4.1.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/isc4.1.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -14,7 +14,7 @@
#
divert(0)
-VERSIONID(`$Id: isc4.1.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: isc4.1.m4,v 8.17 2013-11-22 20:51:15 ca Exp $')
ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `lmail -s $u')')dnl
_DEFIFNOT(`LOCAL_MAILER_FLAGS', `humS9')dnl
ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /bin/lmail)')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/linux.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/linux.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/linux.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2000 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: linux.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: linux.m4,v 8.14 2013-11-22 20:51:15 ca Exp $')
define(`confEBINDIR', `/usr/sbin')
ifdef(`PROCMAIL_MAILER_PATH',,
define(`PROCMAIL_MAILER_PATH', `/usr/bin/procmail'))
Modified: stable/0.8/contrib/sendmail/cf/ostype/maxion.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/maxion.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/maxion.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1996 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -16,7 +16,7 @@
#
divert(0)
-VERSIONID(`$Id: maxion.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: maxion.m4,v 8.18 2013-11-22 20:51:15 ca Exp $')
define(`QUEUE_DIR', `/var/spool/mqueue')dnl
define(`STATUS_FILE', `/var/adm/log/sendmail.st')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/mklinux.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/mklinux.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/mklinux.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2000 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -15,7 +15,7 @@
#
divert(0)
-VERSIONID(`$Id: mklinux.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: mklinux.m4,v 8.16 2013-11-22 20:51:15 ca Exp $')
define(`confEBINDIR', `/usr/sbin')
ifdef(`STATUS_FILE',,
`define(`STATUS_FILE', `/var/log/sendmail.st')')
Modified: stable/0.8/contrib/sendmail/cf/ostype/mpeix.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/mpeix.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/mpeix.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: mpeix.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: mpeix.m4,v 1.2 2013-11-22 20:51:15 ca Exp $')
ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', `/bin/tsmail')')dnl
_DEFIFNOT(`LOCAL_MAILER_FLAGS', `mu9')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/nextstep.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/nextstep.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/nextstep.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: nextstep.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: nextstep.m4,v 8.22 2013-11-22 20:51:15 ca Exp $')
ifdef(`UUCP_MAILER_PATH',, `define(`UUCP_MAILER_PATH', /usr/bin/uux)')dnl
ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /usr/spool/mqueue)')dnl
ifdef(`LOCAL_SHELL_FLAGS',, `define(`LOCAL_SHELL_FLAGS', `euP')')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/openbsd.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/openbsd.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/openbsd.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: openbsd.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: openbsd.m4,v 8.4 2013-11-22 20:51:15 ca Exp $')
ifdef(`STATUS_FILE',, `define(`STATUS_FILE', `/var/log/sendmail.st')')dnl
ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /usr/libexec/mail.local)')dnl
_DEFIFNOT(`LOCAL_MAILER_FLAGS', `rmn9S')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/osf1.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/osf1.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/osf1.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: osf1.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: osf1.m4,v 8.17 2013-11-22 20:51:15 ca Exp $')
ifdef(`STATUS_FILE',, `define(`STATUS_FILE', `/usr/adm/sendmail/sendmail.st')')dnl
define(`confDEF_USER_ID', `daemon')
define(`confEBINDIR', `/usr/lbin')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/powerux.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/powerux.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/powerux.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: powerux.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: powerux.m4,v 8.14 2013-11-22 20:51:15 ca Exp $')
define(`LOCAL_MAILER_PATH', `/usr/bin/rmail')dnl
_DEFIFNOT(`LOCAL_MAILER_FLAGS', `mn9')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/ptx2.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/ptx2.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/ptx2.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1994 Eric P. Allman. All rights reserved.
# Copyright (c) 1994
@@ -15,7 +15,7 @@
# Support for DYNIX/ptx 2.x.
divert(0)
-VERSIONID(`$Id: ptx2.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: ptx2.m4,v 8.18 2013-11-22 20:51:15 ca Exp $')
ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /usr/spool/mqueue)')dnl
define(`LOCAL_MAILER_PATH', `/bin/mail')dnl
_DEFIFNOT(`LOCAL_MAILER_FLAGS', `fmn9')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/qnx.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/qnx.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/qnx.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1997 Eric P. Allman. All rights reserved.
#
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: qnx.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: qnx.m4,v 8.14 2013-11-22 20:51:15 ca Exp $')
define(`QUEUE_DIR', /usr/spool/mqueue)dnl
define(`LOCAL_MAILER_ARGS', `mail $u')dnl
_DEFIFNOT(`LOCAL_MAILER_FLAGS', `Sh')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/riscos4.5.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/riscos4.5.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/riscos4.5.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: riscos4.5.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: riscos4.5.m4,v 8.16 2013-11-22 20:51:15 ca Exp $')
ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `rmail -d $u')')dnl
ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', `/usr/spool/mqueue')')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/sco-uw-2.1.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/sco-uw-2.1.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/sco-uw-2.1.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -13,7 +13,7 @@
# Contributed by Christopher Durham <chrisdu at SCO.COM> of SCO.
#
divert(0)
-VERSIONID(`$Id: sco-uw-2.1.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: sco-uw-2.1.m4,v 8.14 2013-11-22 20:51:15 ca Exp $')
define(`LOCAL_MAILER_PATH', `/usr/bin/rmail')dnl
_DEFIFNOT(`LOCAL_MAILER_FLAGS', `fhCEn9')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/sco3.2.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/sco3.2.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/sco3.2.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: sco3.2.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: sco3.2.m4,v 8.17 2013-11-22 20:51:15 ca Exp $')
ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /usr/spool/mqueue)')dnl
ifdef(`UUCP_MAILER_PATH',, `define(`UUCP_MAILER_PATH', /usr/bin/uux)')dnl
ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /usr/bin/lmail)')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/sinix.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/sinix.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/sinix.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1996 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: sinix.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: sinix.m4,v 8.14 2013-11-22 20:51:15 ca Exp $')
ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /var/spool/mqueue)')dnl
define(`LOCAL_MAILER_PATH', `/bin/mail.local')dnl
ifdef(`STATUS_FILE',, `define(`STATUS_FILE', `/var/sendmail.st')')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/solaris11.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/solaris11.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/solaris11.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2011 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2011 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -12,7 +12,7 @@
#
divert(0)
-VERSIONID(`$Id: solaris11.m4,v 1.1.1.1 2011-05-17 22:19:51 laffer1 Exp $')
+VERSIONID(`$Id: solaris11.m4,v 1.2 2013-11-22 20:51:15 ca Exp $')
divert(-1)
ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -a$g $h!rmail ($u)')')
Modified: stable/0.8/contrib/sendmail/cf/ostype/solaris2.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/solaris2.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/solaris2.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -17,7 +17,7 @@
#
divert(0)
-VERSIONID(`$Id: solaris2.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: solaris2.m4,v 8.23 2013-11-22 20:51:15 ca Exp $')
divert(-1)
ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', `/usr/lib/mail.local')')
Modified: stable/0.8/contrib/sendmail/cf/ostype/solaris2.ml.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/solaris2.ml.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/solaris2.ml.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -17,7 +17,7 @@
#
divert(0)
-VERSIONID(`$Id: solaris2.ml.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: solaris2.ml.m4,v 8.15 2013-11-22 20:51:15 ca Exp $')
divert(-1)
ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', `/usr/lib/mail.local')')
Modified: stable/0.8/contrib/sendmail/cf/ostype/solaris2.pre5.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/solaris2.pre5.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/solaris2.pre5.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -17,7 +17,7 @@
divert(0)
-VERSIONID(`$Id: solaris2.pre5.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: solaris2.pre5.m4,v 8.2 2013-11-22 20:51:15 ca Exp $')
divert(-1)
_DEFIFNOT(`LOCAL_MAILER_FLAGS', `SnE9')
Modified: stable/0.8/contrib/sendmail/cf/ostype/solaris8.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/solaris8.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/solaris8.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2000 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -15,7 +15,7 @@
#
divert(0)
-VERSIONID(`$Id: solaris8.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: solaris8.m4,v 8.3 2013-11-22 20:51:15 ca Exp $')
divert(-1)
ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -a$g $h!rmail ($u)')')
Modified: stable/0.8/contrib/sendmail/cf/ostype/sunos3.5.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/sunos3.5.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/sunos3.5.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,6 +13,6 @@
#
divert(0)
-VERSIONID(`$Id: sunos3.5.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: sunos3.5.m4,v 8.11 2013-11-22 20:51:15 ca Exp $')
define(`confEBINDIR', `/usr/lib')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/sunos4.1.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/sunos4.1.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/sunos4.1.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,6 +13,6 @@
#
divert(0)
-VERSIONID(`$Id: sunos4.1.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: sunos4.1.m4,v 8.11 2013-11-22 20:51:15 ca Exp $')
define(`confEBINDIR', `/usr/lib')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/svr4.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/svr4.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/svr4.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: svr4.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: svr4.m4,v 8.18 2013-11-22 20:51:15 ca Exp $')
define(`LOCAL_MAILER_PATH', `/usr/ucblib/binmail')dnl
define(`LOCAL_SHELL_FLAGS', `ehuP')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/ultrix4.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/ultrix4.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/ultrix4.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,6 +13,6 @@
#
divert(0)
-VERSIONID(`$Id: ultrix4.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: ultrix4.m4,v 8.12 2013-11-22 20:51:15 ca Exp $')
define(`confEBINDIR', `/usr/lib')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/unicos.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/unicos.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/unicos.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2003 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2003 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -11,7 +11,7 @@
#
divert(0)
-VERSIONID(`$Id: unicos.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: unicos.m4,v 1.2 2013-11-22 20:51:15 ca Exp $')
define(`ALIAS_FILE', `/usr/lib/aliases')
define(`HELP_FILE', `/usr/lib/sendmail.hf')
define(`QUEUE_DIR', `/usr/spool/mqueue')
Modified: stable/0.8/contrib/sendmail/cf/ostype/unicosmk.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/unicosmk.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/unicosmk.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2003 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2003 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -11,7 +11,7 @@
#
divert(0)
-VERSIONID(`$Id: unicosmk.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: unicosmk.m4,v 1.2 2013-11-22 20:51:15 ca Exp $')
define(`ALIAS_FILE', `/usr/lib/aliases')
define(`HELP_FILE', `/usr/lib/sendmail.hf')
define(`QUEUE_DIR', `/usr/spool/mqueue')
Modified: stable/0.8/contrib/sendmail/cf/ostype/unicosmp.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/unicosmp.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/unicosmp.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2003 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2003 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -17,7 +17,7 @@
#
divert(0)
-VERSIONID(`$Id: unicosmp.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: unicosmp.m4,v 1.2 2013-11-22 20:51:15 ca Exp $')
_DEFIFNOT(`LOCAL_MAILER_FLAGS', `Ehm9')dnl
ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail -s -d $u')')dnl
ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /var/spool/mqueue)')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/unixware7.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/unixware7.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/unixware7.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2000 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
divert(0)
-VERSIONID(`$Id: unixware7.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: unixware7.m4,v 8.9 2013-11-22 20:51:15 ca Exp $')
ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /var/spool/mqueue)')dnl
define(`confEBINDIR', `/usr/lib')dnl
define(`confTIME_ZONE', `USE_TZ')dnl
Modified: stable/0.8/contrib/sendmail/cf/ostype/unknown.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/unknown.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/unknown.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`$Id: unknown.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: unknown.m4,v 8.10 2013-11-22 20:51:15 ca Exp $')
errprint(`*** ERROR: You have not specified a valid operating system type.')
errprint(` Use the OSTYPE macro to select a valid system type. This')
errprint(` is necessary in order to get the proper pathnames and flags')
Modified: stable/0.8/contrib/sendmail/cf/ostype/uxpds.m4
===================================================================
--- stable/0.8/contrib/sendmail/cf/ostype/uxpds.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/ostype/uxpds.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -16,7 +16,7 @@
#
divert(0)
-VERSIONID(`$Id: uxpds.m4,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`$Id: uxpds.m4,v 8.17 2013-11-22 20:51:15 ca Exp $')
define(`confDEF_GROUP_ID', `6')
define(`LOCAL_MAILER_PATH', `/usr/ucblib/binmail')dnl
Modified: stable/0.8/contrib/sendmail/cf/sendmail.schema
===================================================================
--- stable/0.8/contrib/sendmail/cf/sendmail.schema 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/sendmail.schema 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2002, 2005 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000-2002, 2005 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -5,7 +5,7 @@
# forth in the LICENSE file which can be found at the top level of
# the sendmail distribution.
#
-# $Id: sendmail.schema,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $
+# $Id: sendmail.schema,v 8.23 2013-11-22 20:51:07 ca Exp $
# Note that this schema is experimental at this point as it has had little
# public review. Therefore, it may change in future versions. Feedback
Modified: stable/0.8/contrib/sendmail/cf/sh/makeinfo.sh
===================================================================
--- stable/0.8/contrib/sendmail/cf/sh/makeinfo.sh 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/cf/sh/makeinfo.sh 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -11,7 +11,7 @@
# the sendmail distribution.
#
#
-# $Id: makeinfo.sh,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $
+# $Id: makeinfo.sh,v 8.15 2013-11-22 20:51:17 ca Exp $
#
usewhoami=0
Copied: stable/0.8/contrib/sendmail/contrib/AuthRealm.p0 (from rev 9097, trunk/contrib/sendmail/contrib/AuthRealm.p0)
===================================================================
--- stable/0.8/contrib/sendmail/contrib/AuthRealm.p0 (rev 0)
+++ stable/0.8/contrib/sendmail/contrib/AuthRealm.p0 2016-10-01 17:46:48 UTC (rev 9102)
@@ -0,0 +1,44 @@
+Patch from John Marshall (slightly modified).
+
+diff --git a/sendmail/srvrsmtp.c b/sendmail/srvrsmtp.c
+index 7dba983..bf804ab 100644
+--- a/sendmail/srvrsmtp.c
++++ b/sendmail/srvrsmtp.c
+@@ -84,7 +84,7 @@ static int reset_saslconn __P((sasl_conn_t **_conn, char *_hostname,
+ # define RESET_SASLCONN \
+ do \
+ { \
+- result = reset_saslconn(&conn, AuthRealm, remoteip, \
++ result = reset_saslconn(&conn, hostname, remoteip, \
+ localip, auth_id, &ext_ssf); \
+ if (result != SASL_OK) \
+ sasl_ok = false; \
+@@ -938,8 +938,6 @@ smtp(nullserver, d_flags, e)
+ e->e_features = features;
+ hostname = macvalue('j', e);
+ #if SASL
+- if (AuthRealm == NULL)
+- AuthRealm = hostname;
+ sasl_ok = bitset(SRV_OFFER_AUTH, features);
+ n_mechs = 0;
+ authenticating = SASL_NOT_AUTH;
+@@ -948,8 +946,8 @@ smtp(nullserver, d_flags, e)
+ if (sasl_ok)
+ {
+ # if SASL >= 20000
+- result = sasl_server_new("smtp", AuthRealm, NULL, NULL, NULL,
+- NULL, 0, &conn);
++ result = sasl_server_new("smtp", hostname, AuthRealm, NULL,
++ NULL, NULL, 0, &conn);
+ # elif SASL > 10505
+ /* use empty realm: only works in SASL > 1.5.5 */
+ result = sasl_server_new("smtp", AuthRealm, "", NULL, 0, &conn);
+@@ -5392,7 +5390,7 @@ reset_saslconn(sasl_conn_t **conn, char *hostname,
+
+ sasl_dispose(conn);
+ # if SASL >= 20000
+- result = sasl_server_new("smtp", hostname, NULL, NULL, NULL,
++ result = sasl_server_new("smtp", hostname, AuthRealm, NULL, NULL,
+ NULL, 0, conn);
+ # elif SASL > 10505
+ /* use empty realm: only works in SASL > 1.5.5 */
Modified: stable/0.8/contrib/sendmail/contrib/README
===================================================================
--- stable/0.8/contrib/sendmail/contrib/README 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/contrib/README 2016-10-01 17:46:48 UTC (rev 9102)
@@ -7,4 +7,4 @@
of sendmail. Also, the previous comment applies -- patches belong to
the original author, not to us.
-$Revision: 1.1.1.2 $, Last updated $Date: 2006-02-25 02:33:55 $
+$Revision: 8.2 $, Last updated $Date: 1999-09-24 05:46:47 $
Index: stable/0.8/contrib/sendmail/contrib/bounce-resender.pl
===================================================================
--- stable/0.8/contrib/sendmail/contrib/bounce-resender.pl 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/contrib/bounce-resender.pl 2016-10-01 17:46:48 UTC (rev 9102)
Property changes on: stable/0.8/contrib/sendmail/contrib/bounce-resender.pl
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: stable/0.8/contrib/sendmail/contrib/bsdi.mc
===================================================================
--- stable/0.8/contrib/sendmail/contrib/bsdi.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/contrib/bsdi.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -35,7 +35,7 @@
# See /usr/share/sendmail/README for help in building a configuration file.
#
include(`../m4/cf.m4')
-VERSIONID(`@(#)$Id: bsdi.mc,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $')
+VERSIONID(`@(#)$Id: bsdi.mc,v 8.1 1999-02-06 18:44:08 gshapiro Exp $')
dnl # Specify your OS type below
OSTYPE(`bsd4.4')
Modified: stable/0.8/contrib/sendmail/contrib/buildvirtuser
===================================================================
--- stable/0.8/contrib/sendmail/contrib/buildvirtuser 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/contrib/buildvirtuser 2016-10-01 17:46:48 UTC (rev 9102)
@@ -27,7 +27,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
-# $Id: buildvirtuser,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+# $Id: buildvirtuser,v 1.8 2007-10-08 18:44:15 gshapiro Exp $
=head1 NAME
Property changes on: stable/0.8/contrib/sendmail/contrib/buildvirtuser
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: stable/0.8/contrib/sendmail/contrib/cidrexpand
===================================================================
--- stable/0.8/contrib/sendmail/contrib/cidrexpand 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/contrib/cidrexpand 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
-# $Id: cidrexpand,v 1.1.1.4 2007-11-23 22:10:30 laffer1 Exp $
+# $Id: cidrexpand,v 8.8 2006-08-07 17:18:37 ca Exp $
#
# v 0.4
#
Property changes on: stable/0.8/contrib/sendmail/contrib/cidrexpand
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: stable/0.8/contrib/sendmail/contrib/dnsblaccess.m4
===================================================================
--- stable/0.8/contrib/sendmail/contrib/dnsblaccess.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/contrib/dnsblaccess.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2001-2002, 2005 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2001-2002, 2005 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -59,7 +59,7 @@
dnl ## processed as if the HACK line were not present.
divert(0)
-VERSIONID(`$Id: dnsblaccess.m4,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $')
+VERSIONID(`$Id: dnsblaccess.m4,v 1.7 2013-11-22 20:51:18 ca Exp $')
ifdef(`_ACCESS_TABLE_', `dnl',
`errprint(`*** ERROR: dnsblaccess requires FEATURE(`access_db')
')')
Index: stable/0.8/contrib/sendmail/contrib/etrn.pl
===================================================================
--- stable/0.8/contrib/sendmail/contrib/etrn.pl 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/contrib/etrn.pl 2016-10-01 17:46:48 UTC (rev 9102)
Property changes on: stable/0.8/contrib/sendmail/contrib/etrn.pl
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: stable/0.8/contrib/sendmail/contrib/expn.pl
===================================================================
--- stable/0.8/contrib/sendmail/contrib/expn.pl 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/contrib/expn.pl 2016-10-01 17:46:48 UTC (rev 9102)
Property changes on: stable/0.8/contrib/sendmail/contrib/expn.pl
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: stable/0.8/contrib/sendmail/contrib/link_hash.sh
===================================================================
--- stable/0.8/contrib/sendmail/contrib/link_hash.sh 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/contrib/link_hash.sh 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,9 +1,9 @@
#!/bin/sh
##
-## Copyright (c) 2000 Sendmail, Inc. and its suppliers.
+## Copyright (c) 2000 Proofpoint, Inc. and its suppliers.
## All rights reserved.
##
-## $Id: link_hash.sh,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $
+## $Id: link_hash.sh,v 1.3 2013-11-22 20:51:18 ca Exp $
##
#
# ln a certificate to its hash
Index: stable/0.8/contrib/sendmail/contrib/movemail.pl
===================================================================
--- stable/0.8/contrib/sendmail/contrib/movemail.pl 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/contrib/movemail.pl 2016-10-01 17:46:48 UTC (rev 9102)
Property changes on: stable/0.8/contrib/sendmail/contrib/movemail.pl
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: stable/0.8/contrib/sendmail/contrib/passwd-to-alias.pl
===================================================================
--- stable/0.8/contrib/sendmail/contrib/passwd-to-alias.pl 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/contrib/passwd-to-alias.pl 2016-10-01 17:46:48 UTC (rev 9102)
Property changes on: stable/0.8/contrib/sendmail/contrib/passwd-to-alias.pl
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: stable/0.8/contrib/sendmail/contrib/qtool.8
===================================================================
--- stable/0.8/contrib/sendmail/contrib/qtool.8 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/contrib/qtool.8 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1999, 2001-2002 Sendmail, Inc. and its suppliers.
+.\" Copyright (c) 1999, 2001-2002 Proofpoint, Inc. and its suppliers.
.\" All rights reserved.
.\"
.\" By using this file, you agree to the terms and conditions set
@@ -6,9 +6,9 @@
.\" the sendmail distribution.
.\"
.\"
-.\" $Id: qtool.8,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $
+.\" $Id: qtool.8,v 8.21 2013-11-22 20:51:18 ca Exp $
.\"
-.TH QTOOL 8 "$Date: 2006-02-25 02:33:55 $"
+.TH QTOOL 8 "$Date: 2013-11-22 20:51:18 $"
.SH NAME
qtool
\- manipulate sendmail queues
Modified: stable/0.8/contrib/sendmail/contrib/qtool.pl
===================================================================
--- stable/0.8/contrib/sendmail/contrib/qtool.pl 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/contrib/qtool.pl 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,9 +1,9 @@
#!/usr/bin/env perl
##
-## Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers.
+## Copyright (c) 1998-2002 Proofpoint, Inc. and its suppliers.
## All rights reserved.
##
-## $Id: qtool.pl,v 1.1.1.5 2011-05-17 22:19:51 laffer1 Exp $
+## $Id: qtool.pl,v 8.32 2013-11-22 20:51:18 ca Exp $
##
use strict;
use File::Basename;
Property changes on: stable/0.8/contrib/sendmail/contrib/qtool.pl
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: stable/0.8/contrib/sendmail/contrib/smcontrol.pl
===================================================================
--- stable/0.8/contrib/sendmail/contrib/smcontrol.pl 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/contrib/smcontrol.pl 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
-# $Id: smcontrol.pl,v 1.1.1.2 2010-01-10 20:14:37 laffer1 Exp $
+# $Id: smcontrol.pl,v 8.8 2008-07-21 21:31:43 ca Exp $
use strict;
use Getopt::Std;
Property changes on: stable/0.8/contrib/sendmail/contrib/smcontrol.pl
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: stable/0.8/contrib/sendmail/contrib/socketmapClient.pl
===================================================================
--- stable/0.8/contrib/sendmail/contrib/socketmapClient.pl 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/contrib/socketmapClient.pl 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,7 +1,7 @@
#!/usr/bin/perl -w
#
# Contributed by Bastiaan Bakker for SOCKETMAP
-# $Id: socketmapClient.pl,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $
+# $Id: socketmapClient.pl,v 1.1 2003-05-21 15:36:33 ca Exp $
use strict;
use IO::Socket;
Property changes on: stable/0.8/contrib/sendmail/contrib/socketmapClient.pl
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: stable/0.8/contrib/sendmail/contrib/socketmapServer.pl
===================================================================
--- stable/0.8/contrib/sendmail/contrib/socketmapServer.pl 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/contrib/socketmapServer.pl 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,7 +1,7 @@
#!/usr/bin/perl -w
#
# Contributed by Bastiaan Bakker for SOCKETMAP
-# $Id: socketmapServer.pl,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $
+# $Id: socketmapServer.pl,v 1.1 2003-05-21 15:36:33 ca Exp $
use strict;
use IO::Socket;
Property changes on: stable/0.8/contrib/sendmail/contrib/socketmapServer.pl
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: stable/0.8/contrib/sendmail/devtools/bin/Build
===================================================================
--- trunk/contrib/sendmail/devtools/bin/Build 2016-10-01 11:56:25 UTC (rev 9097)
+++ stable/0.8/contrib/sendmail/devtools/bin/Build 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,826 +0,0 @@
-#!/bin/sh
-
-# Copyright (c) 1998-2002, 2008 Proofpoint, Inc. and its suppliers.
-# All rights reserved.
-# Copyright (c) 1993, 1996-1997 Eric P. Allman. All rights reserved.
-# Copyright (c) 1993
-# The Regents of the University of California. All rights reserved.
-#
-# By using this file, you agree to the terms and conditions set
-# forth in the LICENSE file which can be found at the top level of
-# the sendmail distribution.
-#
-#
-# $Id: Build,v 8.189 2013-12-02 22:11:07 gshapiro Exp $
-#
-
-#
-# A quick-and-dirty script to compile sendmail and related programs
-# in the presence of multiple architectures. To use, just use
-# "sh Build".
-#
-
-trap "rm -f $obj/.settings$$; exit" 1 2 3 15
-
-cflag=""
-mflag=""
-Mflag=""
-Aflag=""
-sflag=""
-makeargs=""
-libdirs=""
-incdirs=""
-libsrch=""
-libpath=""
-siteconfig=""
-pfx=""
-obj=""
-oscf=""
-arch=""
-os=""
-rel=""
-mkdir="mkdir -p"
-SENDMAIL_BUILD_FLAGS=""
-EX_OK=0
-EX_USAGE=64
-EX_NOINPUT=66
-EX_UNAVAILABLE=69
-SHELL=/bin/sh
-
-# default to a optimized build to behave like the old system.
-build_variant="optimized"
-
-full_src_dir=`pwd`
-if [ -z "$src_dir" ]
-then
- src_dir=`basename ${full_src_dir}`
-fi
-absolute_base_dir=`echo ${full_src_dir} | sed "s#${src_dir}\\$##"`
-obj_rel_base_dir='../..'
-
-while [ ! -z "$1" ]
-do
- case $1
- in
- -src) # Specify pathname of source directory relative to
- # root of cvs tree. This relative pathname may have
- # multiple components, as in 'foo/bar/baz', and will also
- # be used to form the pathname of the object directory.
- shift
- arg=$1
- if [ -z "$arg" ]
- then
- echo "Missing arg for -src" >&2
- exit $EX_USAGE
- fi
- case $arg
- in
- /*) echo "Arg for -src must not begin with / ($arg)" >&2
- exit $EX_USAGE
- ;;
- esac
- src_dir="$arg"
- absolute_base_dir=`echo ${full_src_dir} | sed "s;/${src_dir}$;;"`
- obj_rel_base_dir=`echo x/${src_dir} | sed "s;[^/][^/]*;..;g"`
- SMROOT=${absolute_base_dir}
- shift
- ;;
- -c) # clean out existing $obj tree
- cflag=1
- SENDMAIL_BUILD_FLAGS="$SENDMAIL_BUILD_FLAGS $1"
- shift
- ;;
-
- -m) # show Makefile name only
- mflag=1
- shift
- ;;
-
- -M) # show the name of the obj. directory
- Mflag=1
- shift
- ;;
-
- -A) # show the name of the architecture
- Aflag=1
- shift
- ;;
-
- -E*) # environment variables to pass into Build
- arg=`echo $1 | sed 's/^-E//'`
- if [ -z "$arg" ]
- then
- shift # move to argument
- arg=$1
- fi
- if [ -z "$arg" ]
- then
- echo "Empty -E flag" >&2
- exit $EX_USAGE
- else
- case $arg
- in
- *=*) # check format
- eval $arg
- export `echo $arg | sed 's;=.*;;'`
- SENDMAIL_BUILD_FLAGS="$SENDMAIL_BUILD_FLAGS -E \"$arg\""
- ;;
- *) # bad format
- echo "Bad format for -E argument ($arg)" >&2
- exit $EX_USAGE
- ;;
- esac
- shift
- fi
- ;;
-
- -L*) # set up LIBDIRS
- libdirs="$libdirs $1"
- SENDMAIL_BUILD_FLAGS="$SENDMAIL_BUILD_FLAGS $1"
- shift
- ;;
-
- -I*) # set up INCDIRS
- incdirs="$incdirs $1"
- SENDMAIL_BUILD_FLAGS="$SENDMAIL_BUILD_FLAGS $1"
- shift
- ;;
-
- -f*) # select site config file
- arg=`echo $1 | sed 's/^-f//'`
- if [ -z "$arg" ]
- then
- shift # move to argument
- arg=$1
- fi
- if [ "$pfx" ]
- then
- echo "May not use -f and -Q together"
- exit $EX_USAGE
- fi
- if [ "$siteconfig" ]
- then
- echo "Only one -f flag allowed" >&2
- exit $EX_USAGE
- else
- siteconfig=$arg
- if [ -z "$siteconfig" ]
- then
- echo "Missing argument for -f flag" >&2
- exit $EX_USAGE
- elif [ ! -f "$siteconfig" ]
- then
- echo "${siteconfig}: File not found"
- exit $EX_NOINPUT
- else
- shift # move past argument
- case $arg
- in
- /*)
- SENDMAIL_BUILD_FLAGS="$SENDMAIL_BUILD_FLAGS -f \"$siteconfig\""
- ;;
- *)
- SENDMAIL_BUILD_FLAGS="$SENDMAIL_BUILD_FLAGS -f \"${full_src_dir}/$siteconfig\""
- ;;
- esac
- fi
- fi
- ;;
-
- -O*) # Set object directory manually.
- arg="`echo $1 | sed 's/^-O//'`"
- if [ -z "$arg" ]
- then
- shift # move to argument
- arg="$1"
- fi
- case $arg
- in
- /*)
- OBJ_ROOT="$arg"
- SENDMAIL_BUILD_FLAGS="$SENDMAIL_BUILD_FLAGS -O \"$OBJ_ROOT\""
- obj_rel_base_dir=$absolute_base_dir
- ;;
- *)
- echo "Absolute directory path required for -O flag" >&2
- exit $EX_USAGE
- ;;
- esac
- shift
- ;;
-
- -S) # skip auto-configure
- sflag="-s"
- SENDMAIL_BUILD_FLAGS="$SENDMAIL_BUILD_FLAGS $1"
- shift
- ;;
-
- -Q*) # Select a prefix for the Site/*.config.m4 file
- arg=`echo $1 | sed 's/^-Q//'`
- if [ -z "$arg" ]
- then
- shift # move to argument
- arg=$1
- fi
- if [ -z "$arg" ]
- then
- echo "Empty -Q flag" >&2
- exit $EX_USAGE
- elif [ "$siteconfig" ]
- then
- echo "May not use -Q and -f together" >&2
- exit $EX_USAGE
- elif [ "$pfx" ]
- then
- echo "Only one -Q allowed" >&2
- exit $EX_USAGE
- else
- pfx=$arg
- SENDMAIL_BUILD_FLAGS="$SENDMAIL_BUILD_FLAGS -Q \"$pfx\""
- fi
- shift
- ;;
-
- -v) # Select a build variant: debug, optimized, purify, whatever.
- shift
- build_variant=$1
- if [ -z "$build_variant" ]
- then
- echo "Usage error with \"-v\" <build_variant>" >&2
- echo "You must specify exactly one build variant of debug|optimized|purify" >&2
- exit $EX_USAGE
- fi
- shift
- ;;
-
- *) # pass argument to make
- makeargs="$makeargs \"$1\""
- #SENDMAIL_BUILD_FLAGS="$SENDMAIL_BUILD_FLAGS \"$1\""
- shift
- ;;
- esac
-done
-
-# process selected build variant.
-case $build_variant in
- debug)
- M4_BLDVARIANT_FLAGS="-DconfBLDVARIANT=DEBUG"
- ;;
- optimized)
- M4_BLDVARIANT_FLAGS="-DconfBLDVARIANT=OPTIMIZED"
- ;;
- purify)
- M4_BLDVARIANT_FLAGS="-DconfBLDVARIANT=PURIFY"
- echo "Sorry, the purify build variant has not been plumbed yet. (Bummer.)" >&2
- exit $EX_USAGE
- ;;
- *)
- exit $EX_USAGE
- ;;
-esac
-
-
-#
-# Do heuristic guesses !ONLY! for machines that do not have uname
-#
-if [ -d /NextApps -a ! -f /bin/uname -a ! -f /usr/bin/uname ]
-then
- # probably a NeXT box
- arch=`hostinfo | sed -n 's/.*Processor type: \([^ ]*\).*/\1/p'`
- os=NeXT
- rel=`hostinfo | sed -n 's/.*NeXT Mach \([0-9\.]*\).*/\1/p'`
-elif [ -f /usr/sony/bin/machine -a -f /etc/osversion ]
-then
- # probably a Sony NEWS 4.x
- os=NEWS-OS
- rel=`awk '{ print $3}' /etc/osversion`
- arch=`/usr/sony/bin/machine`
-elif [ -d /usr/omron -a -f /bin/luna ]
-then
- # probably a Omron LUNA
- os=LUNA
- if [ -f /bin/luna1 ] && /bin/luna1
- then
- rel=unios-b
- arch=luna1
- elif [ -f /bin/luna2 ] && /bin/luna2
- then
- rel=Mach
- arch=luna2
- elif [ -f /bin/luna88k ] && /bin/luna88k
- then
- rel=Mach
- arch=luna88k
- fi
-elif [ -d /usr/apollo -a -d \`node_data ]
-then
- # probably a Apollo/DOMAIN
- os=DomainOS
- arch=$ISP
- rel=`/usr/apollo/bin/bldt | grep Domain | awk '{ print $4 }' | sed -e 's/,//g'`
-fi
-
-if [ ! "$arch" -a ! "$os" -a ! "$rel" ]
-then
- arch=`uname -m | sed -e 's/ //g' -e 's/\//-/g'`
- os=`uname -s | sed -e 's/\//-/g' -e 's/ //g'`
- rel=`uname -r | sed -e 's/(/-/g' -e 's/)//g' -e 's/ //g'`
-fi
-
-#
-# Tweak the values we have already got. PLEASE LIMIT THESE to
-# tweaks that are absolutely necessary because your system uname
-# routine doesn't return something sufficiently unique. Don't do
-# it just because you don't like the name that is returned. You
-# can combine the architecture name with the os name to create a
-# unique Makefile name.
-#
-
-# tweak machine architecture
-case $arch
-in
- sun4*) arch=sun4;;
-
- 9000/*) arch=`echo $arch | sed -e 's/9000.//' -e 's/..$/xx/'`;;
-
- DS/907000) arch=ds90;;
-
- NILE*) arch=NILE
- os=`uname -v`;;
-
- CRAYT3E) os=UNICOS-mk;;
-
- CRAY[CJT]90*|CRAYTS|CRAYSV1*|CRAYY-MP)
- os=UNICOS;;
-esac
-
-# tweak operating system type and release
-node=`uname -n | sed -e 's/\//-/g' -e 's/ //g'`
-if [ "$os" = "$node" -a "$arch" = "i386" -a "$rel" = 3.2 -a "`uname -v`" = 2 ]
-then
- # old versions of SCO UNIX set uname -s the same as uname -n
- os=SCO_SV
-fi
-if [ "$rel" = 4.0 ]
-then
- case $arch in
- 3[34]??|3[34]??,*|3[34]??[A-Z]|4[48]??|56??)
- if [ -d /usr/sadm/sysadm/add-ons/WIN-TCP ]
- then
- os=NCR.MP-RAS
- rel=2.x
- arch=i486
- elif [ -d /usr/sadm/sysadm/add-ons/inet ]
- then
- os=NCR.MP-RAS
- rel=3.x
- arch=i486
- fi
- ;;
- esac
-fi
-
-case $os
-in
- DYNIX-ptx) os=PTX;;
- Paragon*) os=Paragon;;
- HP-UX) rel=`echo $rel | sed -e 's/^[^.]*\.0*//'`;;
- AIX) osl=""
- if [ -x /bin/lslpp ]
- then
- osl=`/bin/lslpp -Lcq bos.rte | cut -f3 -d: | cut -f1-3 -d. 2>/dev/null`
- if [ $? = 0 -a -n "$osl" ]
- then
- rel=$osl
- else
- # command failed; fall back to old method
- osl=""
- fi
- fi
- # check whether it worked
- if [ -z "$osl" ]
- then
- rela=$rel
- rel=`uname -v`
- rel=$rel.$rela
- fi
- arch=PPC
- ;;
- BSD-386) os=BSD-OS;;
- SCO_SV) rel=`uname -X | sed -n 's/Release = //p'`
- if [ "$rel" = "5v6.0.0" ]
- then
- os=OSR; rel=`uname -X | sed -n 's/Release = //p'`
- else
- os=SCO; rel=`uname -X | sed -n 's/Release = 3.2v//p'`
- fi;;
- UNIX_System_V) if [ "$arch" = "ds90" ]
- then
- os="UXPDS"
- rel=`uname -v | sed -e 's/\(V.*\)L.*/\1/'`
- fi;;
- ReliantUNIX-?|SINIX-?) os=SINIX;;
- DomainOS) case $rel in
- 10.4*) rel=10.4;;
- esac
- ;;
- IRIX*) rel=`echo $rel | sed -e 's/-.*$//'`;;
- NeXT) mkdir="mkdirs";;
- UNICOSMK) rel=`echo $rel | sed -e 's/\(.*\)\.\(.*\)\.\(.*\)\..*$/\1.\2.\3/'`;;
- UNICOS*) rel=`echo $rel | sed -e 's/\(.*\)\.\(.*\)\..*$/\1.\2/'`;;
-esac
-
-# get "base part" of operating system release
-rroot=`echo $rel | sed -e 's/\.[^.]*$//'`
-rbase=`echo $rel | sed -e 's/\..*//'`
-if [ "$rroot" = "$rbase" ]
-then
- rroot=$rel
-fi
-
-# heuristic tweaks to clean up names -- PLEASE LIMIT THESE!
-if [ "$os" = "unix" ]
-then
- # might be Altos System V
- case $rel
- in
- 5.3*) os=Altos;;
- esac
-elif [ -r /unix -a -r /usr/lib/libseq.a -a -r /lib/cpp ]
-then
- # might be a DYNIX/ptx 2.x system, which has a broken uname
- if strings /lib/cpp | grep _SEQUENT_ > /dev/null
- then
- os=PTX
- fi
-elif [ -d /usr/nec ]
-then
- # NEC machine -- what is it running?
- if [ "$os" = "UNIX_System_V" ]
- then
- os=EWS-UX_V
- elif [ "$os" = "UNIX_SV" ]
- then
- os=UX4800
- fi
-elif [ "$arch" = "mips" ]
-then
- case $rel
- in
- 4_*)
- if [ `uname -v` = "UMIPS" ]
- then
- os=RISCos
- fi;;
- esac
-fi
-
-# see if there is a "user suffix" specified
-if [ "${SENDMAIL_SUFFIX-}x" = "x" ]
-then
- sfx=""
-else
- sfx=".${SENDMAIL_SUFFIX}"
-fi
-
-if [ ! -n "$Mflag" -a ! -n "$Aflag" ]
-then
- echo "Configuration: pfx=$pfx, os=$os, rel=$rel, rbase=$rbase, rroot=$rroot, arch=$arch, sfx=$sfx, variant=$build_variant"
-fi
-
-SMROOT=${SMROOT-`(cd ..;pwd)`}
-BUILDTOOLS=${BUILDTOOLS-$SMROOT/devtools}
-export SMROOT BUILDTOOLS
-
-# see if we are in a Build-able directory
-if [ ! -f Makefile.m4 -a ! -n "$Aflag" ]; then
- echo "Makefile.m4 not found. Build can only be run from a source directory."
- exit $EX_UNAVAILABLE
-fi
-
-incdirs="$incdirs -I\${SRCDIR}/include"
-
-if [ -z "$OBJ_ROOT" ]; then
- OBJ_ROOT=${SMROOT}
-fi
-
-if [ "${pfx}x" = "x" ]
-then
- prefix=""
-else
- prefix=".$pfx"
-fi
-
-# Print out the architecture (to build up an obj dir path) and exit
-if [ -n "$Aflag" ]
-then
- echo "$os.$rel.$arch$sfx"
- exit $EX_OK
-fi
-
-# now try to find a reasonable object directory
-if [ -r ${OBJ_ROOT}/obj${prefix}.$os.$rel.$arch$sfx ]; then
- abs_obj_dir=${OBJ_ROOT}/obj${prefix}.$os.$rel.$arch$sfx
-elif [ -r ${OBJ_ROOT}/obj${prefix}.$os.$rroot.$arch$sfx ]; then
- abs_obj_dir=${OBJ_ROOT}/obj${prefix}.$os.$rroot.$arch$sfx
-elif [ -r ${OBJ_ROOT}/obj${prefix}.$os.$rbase.x.$arch$sfx ]; then
- abs_obj_dir=${OBJ_ROOT}/obj${prefix}.$os.$rbase.x.$arch$sfx
-elif [ -r ${OBJ_ROOT}/obj${prefix}.$os.$rel$sfx ]; then
- abs_obj_dir=${OBJ_ROOT}/obj${prefix}.$os.$rel$sfx
-elif [ -r ${OBJ_ROOT}/obj${prefix}.$os.$rbase.x$sfx ]; then
- abs_obj_dir=${OBJ_ROOT}/obj${prefix}.$os.$rbase.x$sfx
-elif [ -r ${OBJ_ROOT}/obj${prefix}.$os.$arch$sfx ]; then
- abs_obj_dir=${OBJ_ROOT}/obj${prefix}.$os.$arch$sfx
-elif [ -r ${OBJ_ROOT}/obj${prefix}.$rel.$arch$sfx ]; then
- abs_obj_dir=${OBJ_ROOT}/obj${prefix}.$rel.$arch$sfx
-elif [ -r ${OBJ_ROOT}/obj${prefix}.$rbase.x.$arch$sfx ]; then
- abs_obj_dir=${OBJ_ROOT}/obj${prefix}.$rbase.x.$arch$sfx
-elif [ -r ${OBJ_ROOT}/obj${prefix}.$os$sfx ]; then
- abs_obj_dir=${OBJ_ROOT}/obj${prefix}.$os$sfx
-elif [ -r ${OBJ_ROOT}/obj${prefix}.$arch$sfx ]; then
- abs_obj_dir=${OBJ_ROOT}/obj${prefix}.$arch$sfx
-elif [ -r ${OBJ_ROOT}/obj${prefix}.$rel$sfx ]; then
- abs_obj_dir=${OBJ_ROOT}/obj${prefix}.$rel$sfx
-elif [ -r ${OBJ_ROOT}/obj${prefix}.$sfx ]; then
- abs_obj_dir=${OBJ_ROOT}/obj${prefix}.$sfx
-fi
-
-if [ -n "$abs_obj_dir" ]
-then
- obj=${abs_obj_dir}/${src_dir}
-fi
-
-# Print the directory which would be used for the build and exit
-if [ -n "$Mflag" ]
-then
- if [ ! -n "$obj" ]
- then
- obj=${OBJ_ROOT}/obj.$os.$rel.$arch$sfx/${src_dir}
- fi
- echo "$obj"
- exit $EX_OK
-fi
-
-# Check if trying to use -f with an existing obj directory
-if [ -n "$siteconfig" -a -n "$obj" -a -d "$obj" -a -z "$cflag" ]
-then
- echo "Can not use Build's -f flag with an existing object tree."
- echo "If you wish to change configuration information, use the -c flag to clear"
- echo "the existing $obj tree."
- exit $EX_USAGE
-fi
-
-# Check if trying to use -Q with an existing obj directory
-if [ -n "$pfx" -a -n "$obj" -a -d "$obj" -a -z "$cflag" ]
-then
- echo "Can not use Build's -Q flag with an existing object tree."
- echo "If you wish to change configuration information, use the -c flag to clear"
- echo "the existing $obj tree."
- exit $EX_USAGE
-fi
-
-
-# Clean out the directory before building.
-if [ "$cflag" ]
-then
- if [ -n "$obj" ]
- then
- echo "Clearing out existing $obj tree"
- rm -rf $obj
- fi
-fi
-
-# If we didn't detect an existing obj directory, makeup a new obj name.
-if [ -z "$obj" ]
-then
- abs_obj_dir=${OBJ_ROOT}/obj${prefix}.$os.$rel.$arch$sfx
- obj=${abs_obj_dir}/${src_dir}
-fi
-
-# Check if obj directory exists
-if [ ! -r "$obj" ]
-then
- if [ -r $BUILDTOOLS/OS/$os.$rel.$arch$sfx ]; then
- oscf=$os.$rel.$arch$sfx
- elif [ -r $BUILDTOOLS/OS/$os.$rel.$arch ]; then
- oscf=$os.$rel.$arch
- elif [ -r $BUILDTOOLS/OS/$os.$rroot.$arch$sfx ]; then
- oscf=$os.$rroot.$arch$sfx
- elif [ -r $BUILDTOOLS/OS/$os.$rroot.$arch ]; then
- oscf=$os.$rroot.$arch
- elif [ -r $BUILDTOOLS/OS/$os.$rbase.x.$arch$sfx ]; then
- oscf=$os.$rbase.x.$arch$sfx
- elif [ -r $BUILDTOOLS/OS/$os.$rbase.x.$arch ]; then
- oscf=$os.$rbase.x.$arch
- elif [ -r $BUILDTOOLS/OS/$os.$rel$sfx ]; then
- oscf=$os.$rel$sfx
- elif [ -r $BUILDTOOLS/OS/$os.$rel ]; then
- oscf=$os.$rel
- elif [ -r $BUILDTOOLS/OS/$os.$rroot$sfx ]; then
- oscf=$os.$rroot$sfx
- elif [ -r $BUILDTOOLS/OS/$os.$rroot ]; then
- oscf=$os.$rroot
- elif [ -r $BUILDTOOLS/OS/$os.$rbase.x$sfx ]; then
- oscf=$os.$rbase.x$sfx
- elif [ -r $BUILDTOOLS/OS/$os.$rbase.x ]; then
- oscf=$os.$rbase.x
- elif [ -r $BUILDTOOLS/OS/$os.$arch$sfx ]; then
- oscf=$os.$arch$sfx
- elif [ -r $BUILDTOOLS/OS/$os.$arch ]; then
- oscf=$os.$arch
- elif [ -r $BUILDTOOLS/OS/$rel.$arch$sfx ]; then
- oscf=$rel.$arch$sfx
- elif [ -r $BUILDTOOLS/OS/$rel.$arch ]; then
- oscf=$rel.$arch
- elif [ -r $BUILDTOOLS/OS/$rroot.$arch$sfx ]; then
- oscf=$rroot.$arch$sfx
- elif [ -r $BUILDTOOLS/OS/$rroot.$arch ]; then
- oscf=$rroot.$arch
- elif [ -r $BUILDTOOLS/OS/$rbase.x.$arch$sfx ]; then
- oscf=$rbase.x.$arch$sfx
- elif [ -r $BUILDTOOLS/OS/$rbase.x.$arch ]; then
- oscf=$rbase.x.$arch
- elif [ -r $BUILDTOOLS/OS/$os$sfx ]; then
- oscf=$os$sfx
- elif [ -r $BUILDTOOLS/OS/$os ]; then
- oscf=$os
- elif [ -r $BUILDTOOLS/OS/$arch$sfx ]; then
- oscf=$arch$sfx
- elif [ -r $BUILDTOOLS/OS/$arch ]; then
- oscf=$arch
- elif [ -r $BUILDTOOLS/OS/$rel$sfx ]; then
- oscf=$rel$sfx
- elif [ -r $BUILDTOOLS/OS/$rel ]; then
- oscf=$rel
- elif [ -r $BUILDTOOLS/OS/$rel$sfx ]; then
- oscf=$rel$sfx
- else
- echo "Cannot determine how to support $os.$rel.$arch" >&2
- exit $EX_UNAVAILABLE
- fi
- M4=`$SHELL $BUILDTOOLS/bin/find_m4.sh`
- ret=$?
- if [ $ret -ne 0 ]
- then
- exit $ret
- fi
- echo "Using M4=$M4"
- export M4
- if [ "$mflag" ]
- then
- echo "Will run in virgin $obj using $BUILDTOOLS/OS/$oscf"
- exit $EX_OK
- fi
-
- echo "Creating $obj using $BUILDTOOLS/OS/$oscf"
- ${mkdir} $obj
-
- ln="ln -s"
- (cd $obj
- # This glob doesn't actually glob to something everywhere,
- # thus the protective measures.
- for i in ${obj_rel_base_dir}/${src_dir}/*.[chly13458]
- do
- if [ -f $i ]
- then
- $ln $i .
- fi
- done
- # This glob doesn't actually glob to something everywhere,
- # thus the protective measures.
- for i in ${obj_rel_base_dir}/${src_dir}/*.0
- do
- if [ -f $i ]
- then
- $ln $i `basename $i`.dist
- fi
- done)
- if [ -f helpfile ]
- then
- (cd $obj; $ln ${obj_rel_base_dir}/${src_dir}/helpfile .)
- fi
-
- rm -f $obj/.settings$$
- echo 'divert(-1)' > $obj/.settings$$
- cat $BUILDTOOLS/M4/header.m4 >> $obj/.settings$$
- echo "define(\`bldOS', \`\`$os'')" >> $obj/.settings$$
- echo "define(\`bldREL', \`\`$rel'')" >> $obj/.settings$$
- echo "define(\`bldARCH', \`\`$arch'')" >> $obj/.settings$$
- cat $BUILDTOOLS/OS/$oscf >> $obj/.settings$$
-
- cur_dir=`pwd`
- cd $obj/..
- absolute_obj_dir=`pwd`
-
-
- cd $cur_dir
- echo "ifdef(\`bldABS_OBJ_DIR',,\`define(\`bldABS_OBJ_DIR', \`$absolute_obj_dir')')" >> $obj/.settings$$
- rel_src_dir="$obj_rel_base_dir/$src_dir"
- echo "define(\`bldSRC_NAME', \`$src_dir')" >> $obj/.settings$$
- echo "define(\`bldREL_SRC_DIR', \`$rel_src_dir')" >> $obj/.settings$$
-
- if [ ! -z "$pfx" ]
- then
- # They gave us a specific prefix, let's try it out.
- if [ -f $BUILDTOOLS/Site/$pfx.$oscf$sfx.m4 ]
- then
- siteconfig=$BUILDTOOLS/Site/$pfx.$oscf$sfx.m4
- elif [ -f $BUILDTOOLS/Site/$pfx.$oscf.m4 ]
- then
- siteconfig=$BUILDTOOLS/Site/$pfx.$oscf.m4
- fi
- if [ -f $BUILDTOOLS/Site/$pfx.config.m4 ]
- then
- siteconfig="$BUILDTOOLS/Site/$pfx.config.m4 $siteconfig"
- fi
- elif [ -z "$siteconfig" ]
- then
- # none specified, use defaults
- if [ -f $BUILDTOOLS/Site/site.$oscf$sfx.m4 ]
- then
- siteconfig=$BUILDTOOLS/Site/site.$oscf$sfx.m4
- elif [ -f $BUILDTOOLS/Site/site.$oscf.m4 ]
- then
- siteconfig=$BUILDTOOLS/Site/site.$oscf.m4
- fi
- if [ -f $BUILDTOOLS/Site/site.config.m4 ]
- then
- siteconfig="$BUILDTOOLS/Site/site.config.m4 $siteconfig"
- fi
- if [ -f $BUILDTOOLS/Site/site.post.m4 ]
- then
- siteconfig="$siteconfig $BUILDTOOLS/Site/site.post.m4"
- fi
- fi
- if [ ! -z "$siteconfig" ]
- then
- echo "Including $siteconfig"
- cat $siteconfig >> $obj/.settings$$
- fi
- if [ "$libdirs" ]
- then
- echo "define(\`confLIBDIRS', confLIBDIRS \`\`$libdirs'')" >> $obj/.settings$$
- fi
- if [ "$incdirs" ]
- then
- echo "define(\`confINCDIRS', \`\`$incdirs'' confINCDIRS)" >> $obj/.settings$$
- fi
- echo "define(\`_SRC_PATH_', \`\`$obj_rel_base_dir'')" >> $obj/.settings$$
- echo "define(\`bldSRC_PATH', \`\`$obj_rel_base_dir'')" >> $obj/.settings$$
- echo 'divert(0)dnl' >> $obj/.settings$$
- libdirs=`(cat $obj/.settings$$; echo "_SRIDBIL_= confLIBDIRS" ) | \
- sed -e 's/\(.\)include/\1_include_/g' -e 's/#define/#_define_/g' | \
- ${M4} ${M4_BLDVARIANT_FLAGS} -DconfBUILDTOOLSDIR=$BUILDTOOLS - | \
- grep "^_SRIDBIL_=" | \
- sed -e 's/#_define_/#define/g' -e 's/_include_/include/g' -e "s/^_SRIDBIL_=//"`
- libsrch=`(cat $obj/.settings$$; echo "_HCRSBIL_= confLIBSEARCH" ) | \
- sed -e 's/\(.\)include/\1_include_/g' -e 's/#define/#_define_/g' | \
- ${M4} ${M4_BLDVARIANT_FLAGS} -DconfBUILDTOOLSDIR=$BUILDTOOLS - | \
- grep "^_HCRSBIL_=" | \
- sed -e 's/#_define_/#define/g' -e 's/_include_/include/g' -e "s/^_HCRSBIL_=//"`
- libpath=`(cat $obj/.settings$$; echo "_HCRSBIL_= confLIBSEARCHPATH" ) | \
- sed -e 's/\(.\)include/\1_include_/g' -e 's/#define/#_define_/g' | \
- ${M4} ${M4_BLDVARIANT_FLAGS} -DconfBUILDTOOLSDIR=$BUILDTOOLS - | \
- grep "^_HCRSBIL_=" | \
- sed -e 's/#_define_/#define/g' -e 's/_include_/include/g' -e "s/^_HCRSBIL_=//"`
- soext=`(cat $obj/.settings$$; echo "_EMANOS_= confSHAREDLIB_EXT" ) | \
- sed -e 's/\(.\)include/\1_include_/g' -e 's/#define/#_define_/g' | \
- ${M4} ${M4_BLDVARIANT_FLAGS} -DconfBUILDTOOLSDIR=$BUILDTOOLS - | \
- grep "^_EMANOS_=" | \
- sed -e 's/#_define_/#define/g' -e 's/_include_/include/g' -e "s/^_EMANOS_=//" -e 's/^ //'`
- echo 'divert(-1)' >> $obj/.settings$$
- LIBDIRS="$libdirs" LIBSRCH="$libsrch" LIBPATH="$libpath" SITECONFIG="$siteconfig" SOEXT="$soext" $SHELL $BUILDTOOLS/bin/configure.sh $sflag $oscf >> $obj/.settings$$
- echo 'divert(0)dnl' >> $obj/.settings$$
- sed -e 's/\(.\)include/\1_include_/g' -e 's/#define/#_define_/g' -e 's/
-//g' $obj/.settings$$ | \
- ${M4} ${M4_BLDVARIANT_FLAGS} -DconfBUILDTOOLSDIR=$BUILDTOOLS - Makefile.m4 | \
- sed -e 's/#_define_/#define/g' -e 's/_include_/include/g' -e 's/
-//g' > $obj/Makefile
- # That ^M up there was added by quoting it in emacs.
- # Make has problems if lines end in ^M^M, but not in ^M apparently
- if [ $? -ne 0 -o ! -s $obj/Makefile ]
- then
- echo "ERROR: ${M4} failed; You may need a newer version of M4, at least as new as System V or GNU" 1>&2
- rm -rf $obj
- exit $EX_UNAVAILABLE
- fi
- rm -f $obj/.settings$$
- echo "Making dependencies in $obj"
- (cd $obj; ${MAKE-make} depend)
-fi
-
-if [ "$mflag" ]
-then
- makefile=`ls -l $obj/Makefile | sed 's/.* //'`
- if [ -z "$makefile" ]
- then
- echo "ERROR: $obj exists but has no Makefile" >&2
- exit $EX_NOINPUT
- fi
- echo "Will run in existing $obj using $makefile"
- exit $EX_OK
-fi
-
-echo "Making in $obj"
-cd $obj
-eval exec ${MAKE-make} SENDMAIL_BUILD_FLAGS=\"$SENDMAIL_BUILD_FLAGS\" $makeargs
Modified: stable/0.8/contrib/sendmail/doc/op/Makefile
===================================================================
--- stable/0.8/contrib/sendmail/doc/op/Makefile 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/doc/op/Makefile 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $
+# $Id: Makefile,v 8.16 2006-01-05 22:03:31 ca Exp $
DIR= smm/08.sendmailop
SRCS= op.me
Modified: stable/0.8/contrib/sendmail/doc/op/README
===================================================================
--- stable/0.8/contrib/sendmail/doc/op/README 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/doc/op/README 2016-10-01 17:46:48 UTC (rev 9102)
@@ -10,4 +10,4 @@
csh% setenv GROFF_NO_SGR 1
sh$ GROFF_NO_SGR=1; export GROFF_NO_SGR
-$Id: README,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $
+$Id: README,v 8.1 2004-07-20 20:25:10 ca Exp $
Modified: stable/0.8/contrib/sendmail/doc/op/op.me
===================================================================
--- stable/0.8/contrib/sendmail/doc/op/op.me 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/doc/op/op.me 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1998-2005 Sendmail, Inc. and its suppliers.
+.\" Copyright (c) 1998-2013 Proofpoint, Inc. and its suppliers.
.\" All rights reserved.
.\" Copyright (c) 1983, 1995 Eric P. Allman. All rights reserved.
.\" Copyright (c) 1983, 1993
@@ -9,7 +9,7 @@
.\" the sendmail distribution.
.\"
.\"
-.\" $Id: op.me,v 1.1.1.7 2013-08-14 22:35:47 laffer1 Exp $
+.\" $Id: op.me,v 8.759 2014-01-13 14:40:05 ca Exp $
.\"
.\" eqn op.me | pic | troff -me
.\"
@@ -85,18 +85,18 @@
Eric Allman
Claus Assmann
Gregory Neil Shapiro
-Sendmail, Inc.
+Proofpoint, Inc.
.sp
.de Ve
Version \\$2
..
-.Ve $Revision: 1.1.1.7 $
+.Ve $Revision: 8.759 $
.rm Ve
.sp
-For Sendmail Version 8.14
+For Sendmail Version 8.15
.)l
.(f
-Sendmail is a trademark of Sendmail, Inc.
+Sendmail is a trademark of Proofpoint, Inc.
US Patent Numbers 6865671, 6986037.
.)f
.sp 2
@@ -1205,7 +1205,6 @@
.bu
The mail message has been marked as quarantined via a mail filter or
rulesets.
-.bu
.sh 3 "Queue Groups and Queue Directories"
.pp
There are one or more mail queues.
@@ -3263,6 +3262,8 @@
Accept a group-readable key file for STARTTLS.
.ip GroupReadableSASLDBFile
Accept a group-readable Cyrus SASL password file.
+.ip GroupReadableDefaultAuthInfoFile
+Accept a group-readable DefaultAuthInfo file for SASL.
.ip GroupWritableAliasFile
Allow group-writable alias files.
.ip GroupWritableDirPathSafe
@@ -4482,8 +4483,76 @@
If the ruleset does resolve to the
.q error
mailer, sendmail does not try STARTTLS even if it is offered.
-This is useful to interact with MTAs that have broken
-STARTTLS implementations by simply not using it.
+This is useful to deal with STARTTLS interoperability issues
+by simply not using it.
+.sh 4 "tls_srv_features and tls_clt_features"
+.pp
+The
+.i tls_clt_features
+ruleset is called when sendmail connects to another MTA
+and the
+.i tls_srv_features
+ruleset is called when a client connects to
+.i sendmail .
+The arguments for the rulesets are the host name and IP address
+of the other side separated by
+.b $|
+(which is a metacharacter).
+They should return a list of
+.i key=value
+pairs separated by semicolons;
+the list can be empty if no options should be applied to the connection.
+Available keys are and their allowed values are:
+.nr ii 0.2i
+.ip Options
+A comma separated list of SSL related options.
+See
+.i ServerSSLOptions
+and
+.i ClientSSLOptions
+for details, as well as
+.i SSL_set_options (3)
+and note this warning:
+Options already set before are not cleared!
+.ip CipherList
+Specify cipher list for STARTTLS,
+see
+.i ciphers (1)
+for possible values.
+This overrides the global
+.i CipherList
+for the session.
+.ip CertFile
+File containing a certificate.
+.ip KeyFile
+File containing the private key for the certificate.
+.lp
+.lp
+Example:
+.(b
+.ta 1.5i
+Stls_srv_features
+R$* $| 10.$+ $: cipherlist=HIGH
+.)b
+.lp
+Notes:
+.pp
+Errors in these features (e.g., unknown keys or invalid values)
+are logged
+and the current session is aborted to avoid using STARTTLS
+with features that should have been changed.
+.pp
+The keys are case-insensitive.
+.pp
+Both
+.i CertFile
+and
+.i KeyFile
+must be specified together;
+specifying only one is an error.
+.pp
+These rulesets require the sendmail binary to be built with _FFR_TLS_SE_OPTS
+enabled (see the "For Future Release" section).
.sh 4 "authinfo"
.pp
The
@@ -4871,6 +4940,19 @@
The message body type
(7BIT or 8BITMIME),
as determined from the envelope.
+.ip ${cert_fp}
+The fingerprint of the presented certificate (STARTTLS only).
+Note: this macro is only defined if the option
+.b CertFingerprintAlgorithm
+is set,
+in which case the specified fingerprint algorithm is used.
+The valid algorithms depend on the OpenSSL version,
+but usually md5, sha1, and sha256 are available.
+See
+.(b
+openssl dgst -h
+.)b
+for a list.
.ip ${cert_issuer}
The DN (distinguished name) of the CA (certificate authority)
that signed the presented certificate (the cert issuer)
@@ -4877,6 +4959,9 @@
(STARTTLS only).
.ip ${cert_md5}
The MD5 hash of the presented certificate (STARTTLS only).
+Note: this macro is only defined if the option
+.b CertFingerprintAlgorithm
+is not set.
.ip ${cert_subject}
The DN of the presented certificate (called the cert subject)
(STARTTLS only).
@@ -5757,6 +5842,8 @@
.ip i
Do User Database rewriting on envelope sender address.
.ip I
+This flag is deprecated
+and will be removed from a future version.
This mailer will be speaking SMTP
to another
.i sendmail
@@ -6001,6 +6088,10 @@
unless the queued message is selected
using one of the -qI/-qR/-qS queue run modifiers
or an ETRN request.
+.ip !
+Disable an MH hack that drops an explicit
+From: header
+if it is the same as what sendmail would generate.
.pp
Configuration files prior to level 6
assume the `A', `w', `5', `:', `|', `/', and `@' options
@@ -6531,6 +6622,7 @@
If no realm is specified,
.b $j
is used.
+See also KNOWNBUGS.
.ip BadRcptThrottle=\fIN\fP
[no short name]
If set and the specified number of recipients in a single SMTP
@@ -6551,6 +6643,22 @@
[no short name]
File containing one or more CA certificates;
see section about STARTTLS for more information.
+.ip CertFingerprintAlgorithm
+Specify the fingerprint algorithm (digest) to use for the presented cert.
+If the option is not set,
+md5 is used and the macro
+.p ${cert_md5}
+contains the cert fingerprint.
+If the option is explicitly set,
+the specified algorithm (e.g., sha1) is used
+and the macro
+.b ${cert_fp}
+contains the cert fingerprint.
+.ip CipherList
+Specify cipher list for STARTTLS.
+See
+.i ciphers (1)
+for possible values.
.ip CheckAliases
[n]
Validate the RHS of aliases when rebuilding the alias database.
@@ -6633,6 +6741,24 @@
(e.g., one for Family=inet and one for Family=inet6).
A restriction placed on one family only affects
outgoing connections on that particular family.
+.ip ClientSSLOptions
+A space or comma separated list of SSL related options for the client side.
+See
+.i SSL_CTX_set_options (3)
+for a list;
+the available values depend on the OpenSSL version against which
+.i sendmail
+is compiled.
+By default,
+.i SSL_OP_ALL
+.i SSL_OP_NO_SSLv2
+.i SSL_OP_NO_TICKET
+.i -SSL_OP_TLSEXT_PADDING
+are used
+(if those options are available).
+Options can be cleared by preceeding them with a minus sign.
+It is also possible to specify numerical values, e.g.,
+.b -0x0010 .
.ip ColonOkInAddr
[no short name]
If set, colons are acceptable in e-mail addresses
@@ -6729,19 +6855,23 @@
Note: if a CRLFile is specified but the file is unusable,
STARTTLS is disabled.
.ip DHParameters
+This option applies to the server side only.
Possible values are:
.(b
-.ta 1i
-5 use 512 bit prime
-1 use 1024 bit prime
-none do not use Diffie-Hellman
-NAME load prime from file
+.ta 2i
+5 use precomputed 512 bit prime.
+1 generate 1024 bit prime
+2 generate 2048 bit prime.
+i use included precomputed 2048 bit prime (default).
+none do not use Diffie-Hellman.
+/path/to/file load prime from file.
.)b
This is only required if a ciphersuite containing DSA/DH is used.
+The default is ``i'' which selects a precomputed, fixed 2048 bit prime.
If ``5'' is selected, then precomputed, fixed primes are used.
-This is the default for the client side.
-If ``1'' is selected, then prime values are computed during startup.
-This is the default for the server side.
+Note: this option should not be used
+(unless necessary for compatibility with old implementations).
+If ``1'' or ``2'' is selected, then prime values are computed during startup.
Note: this operation can take a significant amount of time on a
slow machine (several seconds), but it is only done once at startup.
If ``none'' is selected, then TLS ciphersuites containing DSA/DH
@@ -6748,6 +6878,12 @@
cannot be used.
If a file name is specified (which must be an absolute path),
then the primes are read from it.
+It is recommended to generate such a file using a command like this:
+.(b
+ openssl dhparam -out /etc/mail/dhparams.pem 2048
+.)b
+If the file is not readable or contains unusable data,
+the default ``i'' is used instead.
.ip DaemonPortOptions=\fIoptions\fP
[O]
Set server SMTP options.
@@ -6780,8 +6916,10 @@
key is used for error messages and logging.
The
.i Addr ess
-mask may be a numeric address in IPv4 dot notation or IPv6 colon notation
-or a network name.
+mask may be
+a numeric address in IPv4 dot notation or IPv6 colon notation,
+or a network name,
+or a path to a local socket.
Note that if a network name is specified,
only the first IP address returned for it will be used.
This may cause indeterminate behavior for network names
@@ -6794,6 +6932,10 @@
should add additional Family=inet6
.b DaemonPortOptions
lines.
+For a local socket, use
+Family=local
+or
+Family=unix.
The
.i InputMailFilters
key overrides the default list of input mail filters listed in the
@@ -7539,6 +7681,13 @@
gives a 452 response
to the MAIL command.
This invites the sender to try again later.
+.ip MaxQueueAge=\fIage\fP
+[no short name]
+If this is set to a value greater than zero,
+entries in the queue will be retried during a queue run
+only if the individual retry time has been reached
+which is doubled for each attempt.
+The maximum retry time is limited by the specified value.
.ip MinQueueAge=\fIage\fP
[no short name]
Don't process any queued jobs
@@ -8027,6 +8176,22 @@
[no short name]
File containing the private key belonging to the server certificate
(used for STARTTLS).
+.ip ServerSSLOptions
+A space or comma separated list of SSL related options for the server side.
+See
+.i SSL_CTX_set_options (3)
+for a list;
+the available values depend on the OpenSSL version against which
+.i sendmail
+is compiled.
+By default,
+.i SSL_OP_ALL
+.i -SSL_OP_TLSEXT_PADDING
+are used
+(if those options are available).
+Options can be cleared by preceeding them with a minus sign.
+It is also possible to specify numerical values, e.g.,
+.b -0x0010 .
.ip ServiceSwitchFile=\fIfilename\fP
[no short name]
If your host operating system has a service switch abstraction
@@ -8182,7 +8347,11 @@
with intervening white space or commas.
The flag ``V'' disables client verification, and hence
it is not possible to use a client certificate for relaying.
-Currently there are no other flags available.
+The flag ``C'' removes the requirement for the TLS server
+to have a cert.
+This only works under very specific circumstances
+and should only be used if the consequences are understood,
+e.g., clients may not work with a server using this.
.ip TempFileMode=\fImode\fP
[F]
The file mode for transcript files, files to which
@@ -8268,6 +8437,12 @@
Note: use
.b DontBlameSendmail
instead; this option is deprecated.
+.ip UseCompressedIPv6Addresses
+[no short name]
+If set, the compressed format of IPv6 addresses,
+such as IPV6:::1, will be used,
+instead of the uncompressed format,
+such as IPv6:0:0:0:0:0:0:0:1.
.ip UseErrorsTo
[l]
If there is an
@@ -8782,6 +8957,31 @@
A map lookup will return only one record.
Hence for some types, e.g., MX records, the return value might be a random
element of the list due to randomizing in the DNS resolver.
+.ip arpa
+Returns the ``reverse'' for the given IP (IPv4 or IPv6) address,
+i.e., the string for the PTR lookup,
+but without trailing
+.b ip6.arpa
+or
+.b in-addr.arpa .
+For example, the following configuration lines:
+.(b
+Karpa arpa
+SArpa
+R$+ $: $(arpa $1 $)
+.)b
+work like this in test mode:
+.(b
+sendmail -bt
+ADDRESS TEST MODE (ruleset 3 NOT automatically invoked)
+Enter <ruleset> <address>
+> Arpa IPv6:1:2:dead:beef:9876:0:0:1
+Arpa input: IPv6 : 1 : 2 : dead : beef : 9876 : 0 : 0 : 1
+Arpa returns: 1 . 0 . 0 . 0 . 0 . 0 . 0 . 0 . 0 . 0 . 0 . 0 . 6 . 7 . 8 . 9 . f . e . e . b . d . a . e . d . 2 . 0 . 0 . 0 . 1 . 0 . 0 . 0
+> Arpa 1.2.3.4
+Arpa input: 1 . 2 . 3 . 4
+Arpa returns: 4 . 3 . 2 . 1
+.)b
.ip sequence
The arguments on the `K' line are a list of maps;
the resulting map searches the argument maps in order
@@ -9207,6 +9407,11 @@
.ip "\-B"
basedomain: specify a domain that is always appended to queries.
.pp
+Socket maps have an optional flag:
+.ip "\-d"
+timeout: specify the timeout (in seconds) for communication
+with the socket map server.
+.pp
The following additional flags are present in the ldap map only:
.ip "\-R"
Do not auto chase referrals. sendmail must be compiled with
@@ -9847,6 +10052,26 @@
.q _SCO_unix_ .
See the sendmail/README
file for the latest scoop on these flags.
+.sh 3 "For Future Releases"
+.pp
+.i sendmail
+often contains compile time options
+.i "For Future Releases"
+(prefix _FFR_)
+which might be enabled in a subsequent version
+or might simply be removed as they turned out not to be really useful.
+These features are usually not documented but if they are,
+then the required (FFR) compile
+time options are listed here for rulesets and macros,
+and in
+.i cf/README
+for mc/cf options.
+FFR compile times options must be enabled when the sendmail binary
+is built from source.
+Enabled FFRs in a binary can be listed with
+.(b
+sendmail -d0.13 < /dev/null | grep FFR
+.)b
.sh 2 "Parameters in sendmail/conf.h"
.pp
Parameters and compilation options
@@ -10649,7 +10874,7 @@
private ServerKeyFile)
at least one root CA (CACertFile),
i.e., a certificate that is used to sign other certificates,
-and a path to a directory which contains other CAs (CACertPath).
+and a path to a directory which contains (zero or more) other CAs (CACertPath).
The file specified via
CACertFile
can contain several certificates of CAs.
@@ -10672,6 +10897,16 @@
C=FileName_of_CA_Certificate
ln -s $C `openssl x509 -noout -hash < $C`.0
.)b
+A better way to do this is to use the
+.b c_rehash
+command that is part of the OpenSSL distribution
+because it handles subject hash collisions
+by incrementing the number in the suffix of the filename of the symbolic link,
+e.g.,
+.b \&.0
+to
+.b \&.1 ,
+and so on.
An X.509 certificate is also required for authentication in client mode
(ClientCertFile and corresponding private ClientKeyFile), however,
.i sendmail
@@ -10685,6 +10920,19 @@
must be stored unencrypted.
The keys are only protected by the permissions of the file system.
Never make a private key available to a third party.
+.pp
+The options
+.i ClientCertFile ,
+.i ClientKeyFile ,
+.i ServerCertFile ,
+and
+.i ServerKeyFile
+can take a second file name,
+which must be separated from the first with a comma
+(note: do not use any spaces)
+to set up a second cert/key pair.
+This can be used to have certs of different types,
+e.g., RSA and DSA.
.sh 3 "PRNG for STARTTLS"
.pp
STARTTLS requires a strong pseudo random number generator (PRNG)
@@ -10869,6 +11117,7 @@
m Deliver mail (default)
s Speak SMTP on input side
a\(dg ``Arpanet'' mode (get envelope sender information from header)
+C Check the configuration file
d Run as a daemon in background
D Run as a daemon in foreground
t Run in test mode
@@ -11478,7 +11727,7 @@
.\".sz 10
.\"Eric Allman
.\".sp
-.\"Version $Revision: 1.1.1.7 $
+.\"Version $Revision: 8.759 $
.\".ce 0
.bp 3
.ce
Copied: stable/0.8/contrib/sendmail/doc/op/op.ps (from rev 9097, trunk/contrib/sendmail/doc/op/op.ps)
===================================================================
(Binary files differ)
Modified: stable/0.8/contrib/sendmail/editmap/Makefile
===================================================================
--- stable/0.8/contrib/sendmail/editmap/Makefile 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/editmap/Makefile 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $
+# $Id: Makefile,v 1.1 2000-08-31 16:19:25 ca Exp $
SHELL= /bin/sh
BUILD= ./Build
Modified: stable/0.8/contrib/sendmail/editmap/Makefile.m4
===================================================================
--- stable/0.8/contrib/sendmail/editmap/Makefile.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/editmap/Makefile.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-dnl $Id: Makefile.m4,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+dnl $Id: Makefile.m4,v 1.6 2006-06-28 21:08:01 ca Exp $
include(confBUILDTOOLSDIR`/M4/switch.m4')
define(`confREQUIRE_LIBSM', `true')
Copied: stable/0.8/contrib/sendmail/editmap/editmap.0 (from rev 9097, trunk/contrib/sendmail/editmap/editmap.0)
===================================================================
--- stable/0.8/contrib/sendmail/editmap/editmap.0 (rev 0)
+++ stable/0.8/contrib/sendmail/editmap/editmap.0 2016-10-01 17:46:48 UTC (rev 9102)
@@ -0,0 +1,62 @@
+EDITMAP(8) EDITMAP(8)
+
+
+
+NNAAMMEE
+ eeddiittmmaapp - query and edit single records in database maps for sendmail
+
+SSYYNNOOPPSSIISS
+ eeddiittmmaapp [--CC _f_i_l_e] [--NN] [--ff] [--qq||--uu||--xx] maptype mapname key [ "value
+ ..." ]
+
+DDEESSCCRRIIPPTTIIOONN
+ EEddiittmmaapp queries or edits one record in database maps used by the keyed
+ map lookups in sendmail(8). Arguments are passed on the command line
+ and output (for queries) is directed to standard output.
+
+ Depending on how it is compiled, eeddiittmmaapp handles up to three different
+ database formats, selected using the _m_a_p_t_y_p_e parameter. They may be
+
+ dbm DBM format maps. This requires the ndbm(3) library.
+
+ btree B-Tree format maps. This requires the new Berkeley DB library.
+
+ hash Hash format maps. This also requires the Berkeley DB library.
+
+ If the _T_r_u_s_t_e_d_U_s_e_r option is set in the sendmail configuration file and
+ eeddiittmmaapp is invoked as root, the generated files will be owned by the
+ specified _T_r_u_s_t_e_d_U_s_e_r_.
+
+ FFllaaggss
+ --CC Use the specified sseennddmmaaiill configuration file for looking up the
+ TrustedUser option.
+
+ --NN Include the null byte that terminates strings in the map (for
+ alias maps).
+
+ --ff Normally all upper case letters in the key are folded to lower
+ case. This flag disables that behaviour. This is intended to
+ mesh with the -f flag in the KK line in sendmail.cf. The value
+ is never case folded.
+
+ --qq Query the map for the specified key. If found, print value to
+ standard output and exit with 0. If not found then print an
+ error message to stdout and exit with EX_UNAVAILABLE.
+
+ --uu Update the record for _k_e_y with _v_a_l_u_e or inserts a new record if
+ one doesn't exist. Exits with 0 on success or EX_IOERR on fail-
+ ure.
+
+ --xx Deletes the specific key from the map. Exits with 0 on success
+ or EX_IOERR on failure.
+
+
+ SSEEEE AALLSSOO
+ sendmail(8), makemap(8)
+
+HHIISSTTOORRYY
+ The eeddiittmmaapp command has no history.
+
+
+
+ $Date: 2013-11-22 20:51:26 $ EDITMAP(8)
Modified: stable/0.8/contrib/sendmail/editmap/editmap.8
===================================================================
--- stable/0.8/contrib/sendmail/editmap/editmap.8 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/editmap/editmap.8 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2000-2001, 2003 Sendmail, Inc. and its suppliers.
+.\" Copyright (c) 2000-2001, 2003 Proofpoint, Inc. and its suppliers.
.\" All rights reserved.
.\"
.\" By using this file, you agree to the terms and conditions set
@@ -6,9 +6,9 @@
.\" the sendmail distribution.
.\"
.\"
-.\" $Id: editmap.8,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $
+.\" $Id: editmap.8,v 1.10 2013-11-22 20:51:26 ca Exp $
.\"
-.TH EDITMAP 8 "$Date: 2006-02-25 02:33:55 $"
+.TH EDITMAP 8 "$Date: 2013-11-22 20:51:26 $"
.SH NAME
.B editmap
\- query and edit single records in database maps for sendmail
Modified: stable/0.8/contrib/sendmail/editmap/editmap.c
===================================================================
--- stable/0.8/contrib/sendmail/editmap/editmap.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/editmap/editmap.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2002, 2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2002, 2004 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1992 Eric P. Allman. All rights reserved.
* Copyright (c) 1992, 1993
@@ -14,7 +14,7 @@
#include <sm/gen.h>
#ifndef lint
SM_UNUSED(static char copyright[]) =
-"@(#) Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.\n\
+"@(#) Copyright (c) 1998-2001 Proofpoint, Inc. and its suppliers.\n\
All rights reserved.\n\
Copyright (c) 1992 Eric P. Allman. All rights reserved.\n\
Copyright (c) 1992, 1993\n\
@@ -22,7 +22,7 @@
#endif /* ! lint */
#ifndef lint
-SM_UNUSED(static char id[]) = "@(#)$Id: editmap.c,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $";
+SM_UNUSED(static char id[]) = "@(#)$Id: editmap.c,v 1.26 2013-11-22 20:51:26 ca Exp $";
#endif /* ! lint */
@@ -76,7 +76,6 @@
{
char *progname;
char *cfile;
- bool verbose = false;
bool query = false;
bool update = false;
bool remove = false;
@@ -131,7 +130,7 @@
(void) sm_strlcpy(user_info.smdbu_name, RunAsUserName,
SMDB_MAX_USER_NAME_LEN);
-#define OPTIONS "C:fquxvN"
+#define OPTIONS "C:fquxN"
while ((opt = getopt(argc, argv, OPTIONS)) != -1)
{
switch (opt)
@@ -159,10 +158,6 @@
nops++;
break;
- case 'v':
- verbose = true;
- break;
-
case 'N':
inclnull = true;
break;
Modified: stable/0.8/contrib/sendmail/include/libmilter/mfapi.h
===================================================================
--- stable/0.8/contrib/sendmail/include/libmilter/mfapi.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/libmilter/mfapi.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2004, 2006, 2008, 2012 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2004, 2006, 2008, 2012 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -7,7 +7,7 @@
* the sendmail distribution.
*
*
- * $Id: mfapi.h,v 1.1.1.7 2013-08-14 22:35:47 laffer1 Exp $
+ * $Id: mfapi.h,v 8.83 2013-11-22 20:51:27 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/libmilter/mfdef.h
===================================================================
--- stable/0.8/contrib/sendmail/include/libmilter/mfdef.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/libmilter/mfdef.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2007 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2007 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -7,7 +7,7 @@
* the sendmail distribution.
*
*
- * $Id: mfdef.h,v 1.1.1.5 2010-01-10 20:14:36 laffer1 Exp $
+ * $Id: mfdef.h,v 8.40 2013-11-22 20:51:27 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/libmilter/milter.h
===================================================================
--- stable/0.8/contrib/sendmail/include/libmilter/milter.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/libmilter/milter.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2003, 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2003, 2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -7,7 +7,7 @@
* the sendmail distribution.
*
*
- * $Id: milter.h,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+ * $Id: milter.h,v 8.42 2013-11-22 20:51:27 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/libsmdb/smdb.h
===================================================================
--- stable/0.8/contrib/sendmail/include/libsmdb/smdb.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/libsmdb/smdb.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2002 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2002 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: smdb.h,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $
+ * $Id: smdb.h,v 8.42 2013-11-22 20:51:28 ca Exp $
*
*/
Modified: stable/0.8/contrib/sendmail/include/sendmail/mailstats.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sendmail/mailstats.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sendmail/mailstats.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -10,7 +10,7 @@
* the sendmail distribution.
*
*
- * $Id: mailstats.h,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $
+ * $Id: mailstats.h,v 8.20 2013-11-22 20:51:30 ca Exp $
*/
#define STAT_VERSION 4
Modified: stable/0.8/contrib/sendmail/include/sendmail/pathnames.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sendmail/pathnames.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sendmail/pathnames.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -9,7 +9,7 @@
* the sendmail distribution.
*
*
- * $Id: pathnames.h,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $
+ * $Id: pathnames.h,v 8.37 2013-11-22 20:51:30 ca Exp $
*/
#ifndef SM_PATHNAMES_H
Modified: stable/0.8/contrib/sendmail/include/sendmail/sendmail.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sendmail/sendmail.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sendmail/sendmail.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -10,7 +10,7 @@
* the sendmail distribution.
*
*
- * $Id: sendmail.h,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $
+ * $Id: sendmail.h,v 8.69 2013-11-22 20:51:30 ca Exp $
*/
/*
@@ -117,9 +117,7 @@
#define DBS_WORLDWRITABLEFORWARDFILE 39
#define DBS_WORLDWRITABLEINCLUDEFILE 40
#define DBS_GROUPREADABLEKEYFILE 41
-#if _FFR_GROUPREADABLEAUTHINFOFILE
-# define DBS_GROUPREADABLEAUTHINFOFILE 42
-#endif /* _FFR_GROUPREADABLEAUTHINFOFILE */
+#define DBS_GROUPREADABLEAUTHINFOFILE 42
/* struct defining such things */
struct dbsval
Modified: stable/0.8/contrib/sendmail/include/sm/assert.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/assert.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/assert.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: assert.h,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $
+ * $Id: assert.h,v 1.11 2013-11-22 20:51:31 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/bdb.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/bdb.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/bdb.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2003 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2002, 2003, 2014 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -7,7 +7,7 @@
* the sendmail distribution.
*
*
- * $Id: bdb.h,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $
+ * $Id: bdb.h,v 1.5 2013-11-22 20:51:31 ca Exp $
*/
#ifndef SM_BDB_H
@@ -19,7 +19,7 @@
# define DB_VERSION_MAJOR 1
# endif /* ! DB_VERSION_MAJOR */
-# if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
+# if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5
# define DBTXN NULL ,
@@ -32,7 +32,7 @@
# define SM_DB_FLAG_ADD(flag) (flag) |= DB_FCNTL_LOCKING
-# else /* DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1 */
+# else /* (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5 */
# define DBTXN
# if !HASFLOCK && defined(DB_FCNTL_LOCKING)
@@ -41,7 +41,7 @@
# define SM_DB_FLAG_ADD(flag) ((void) 0)
# endif /* !HASFLOCK && defined(DB_FCNTL_LOCKING) */
-# endif /* DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1 */
+# endif /* (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5 */
#endif /* NEWDB */
#endif /* ! SM_BDB_H */
Modified: stable/0.8/contrib/sendmail/include/sm/bitops.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/bitops.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/bitops.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -10,7 +10,7 @@
* the sendmail distribution.
*
*
- * $Id: bitops.h,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $
+ * $Id: bitops.h,v 1.3 2013-11-22 20:51:31 ca Exp $
*/
#ifndef SM_BITOPS_H
Modified: stable/0.8/contrib/sendmail/include/sm/cdefs.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/cdefs.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/cdefs.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2002 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: cdefs.h,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $
+ * $Id: cdefs.h,v 1.17 2013-11-22 20:51:31 ca Exp $
*/
/*
@@ -121,11 +121,11 @@
*/
# ifndef SM_CONF_FORMAT_TEST
-# if __GNUC__ == 2 && __GNUC_MINOR__ >= 7
+# if (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) || __GNUC__ > 2
# define SM_CONF_FORMAT_TEST 1
-# else /* __GNUC__ == 2 && __GNUC_MINOR__ >= 7 */
+# else
# define SM_CONF_FORMAT_TEST 0
-# endif /* __GNUC__ == 2 && __GNUC_MINOR__ >= 7 */
+# endif
# endif /* SM_CONF_FORMAT_TEST */
# ifndef PRINTFLIKE
Modified: stable/0.8/contrib/sendmail/include/sm/cf.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/cf.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/cf.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: cf.h,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $
+ * $Id: cf.h,v 1.3 2013-11-22 20:51:31 ca Exp $
*/
#ifndef SM_CF_H
Modified: stable/0.8/contrib/sendmail/include/sm/clock.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/clock.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/clock.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2001, 2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2001, 2004 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -9,7 +9,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: clock.h,v 1.1.1.3 2013-08-14 22:35:47 laffer1 Exp $
+ * $Id: clock.h,v 1.14 2013-11-22 20:51:31 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/conf.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/conf.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/conf.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2011 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2011 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -10,7 +10,7 @@
* the sendmail distribution.
*
*
- * $Id: conf.h,v 1.1.1.6 2011-05-17 22:19:51 laffer1 Exp $
+ * $Id: conf.h,v 1.147 2013-11-22 20:51:31 ca Exp $
*/
/*
@@ -473,6 +473,9 @@
# ifndef HASGETUSERSHELL
# define HASGETUSERSHELL 0 /* getusershell(3) causes core dumps pre-2.7 */
# endif /* ! HASGETUSERSHELL */
+# if SOLARIS < 21200
+# define SIGWAIT_TAKES_1_ARG 1 /* S12 moves to UNIX V7 semantic */
+# endif /* SOLARIS < 21200 */
# else /* SOLARIS */
/* SunOS 4.0.3 or 4.1.x */
@@ -1532,6 +1535,8 @@
# if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
# define GLIBC_VERSION ((__GLIBC__ << 8) + __GLIBC_MINOR__)
# if (GLIBC_VERSION >= 0x201)
+# define SOCKADDR_LEN_T socklen_t
+# define SOCKOPT_LEN_T socklen_t
# undef IPPROTO_ICMPV6 /* linux #defines, glibc enums */
# else /* (GLIBC_VERSION >= 0x201) */
# include <linux/in6.h> /* IPv6 support */
@@ -1904,6 +1909,7 @@
# define GIDSET_T gid_t
# define SOCKADDR_LEN_T size_t
# define SOCKOPT_LEN_T size_t
+# define SIGWAIT_TAKES_1_ARG 1
# ifndef _PATH_UNIX
# define _PATH_UNIX "/stand/unix"
# endif /* ! _PATH_UNIX */
@@ -2918,6 +2924,10 @@
# define FD_SETSIZE 256
#endif /* ! FD_SETSIZE */
+#ifndef SIGWAIT_TAKES_1_ARG
+# define SIGWAIT_TAKES_1_ARG 0
+#endif /* ! SIGWAIT_TAKES_1_ARG */
+
/*
** Size of prescan buffer.
** Despite comments in the _sendmail_ book, this probably should
@@ -2963,6 +2973,17 @@
# define SM_INT32 int32_t
# endif /* ! SM_INT32 */
+/* XXX 16 bit type */
+# ifndef SM_UINT16
+# define SM_UINT16 uint16_t
+# endif /* ! SM_UINT16 */
+
+/* additional valid chars in user/group names in passwd */
+# ifndef SM_PWN_CHARS
+# define SM_PWN_CHARS "-_."
+# endif
+
+
/*
** SVr4 and similar systems use different routines for setjmp/longjmp
** with signal support
@@ -3045,4 +3066,6 @@
# endif /* ! SM_ALIGN_SIZE */
# define SM_ALIGN_BITS (SM_ALIGN_SIZE - 1)
+char *sm_inet6_ntop __P((const void *, char *, size_t));
+
#endif /* ! SM_CONF_H */
Modified: stable/0.8/contrib/sendmail/include/sm/config.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/config.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/config.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2003 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2003 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: config.h,v 1.1.1.3 2013-08-14 22:35:47 laffer1 Exp $
+ * $Id: config.h,v 1.49 2013-11-22 20:51:31 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/debug.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/debug.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/debug.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2001, 2003 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000, 2001, 2003 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: debug.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: debug.h,v 1.17 2013-11-22 20:51:31 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/errstring.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/errstring.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/errstring.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2001, 2003 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2001, 2003 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: errstring.h,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+ * $Id: errstring.h,v 1.11 2013-11-22 20:51:31 ca Exp $
*/
/*
@@ -49,10 +49,18 @@
#define E_SM_WRFILE (E_PSEUDOBASE + 11) /* o readable file */
#define E_DNSBASE (E_PSEUDOBASE + 20) /* base for DNS h_errno */
#define E_SMDBBASE (E_PSEUDOBASE + 40) /* base for libsmdb errors */
-#define E_LDAPBASE (E_PSEUDOBASE + 70) /* base for LDAP errors */
-#define E_LDAPURLBASE (E_PSEUDOBASE + 200) /* base for LDAP URL errors */
+#define E_LDAPREALBASE (E_PSEUDOBASE + 70) /* start of range for LDAP */
+#define E_LDAPBASE (E_LDAPREALBASE + E_LDAP_SHIM) /* LDAP error zero */
+#define E_LDAPURLBASE (E_PSEUDOBASE + 230) /* base for LDAP URL errors */
+/*
+** OpenLDAP uses small negative errors for internal (non-protocol)
+** errors. We expect them to be between zero and -E_LDAP_SHIM
+** (and then offset by E_LDAPBASE).
+*/
+#define E_LDAP_SHIM 30
+
/* libsmdb */
#define SMDBE_OK 0
#define SMDBE_MALLOC (E_SMDBBASE + 1)
Modified: stable/0.8/contrib/sendmail/include/sm/exc.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/exc.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/exc.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: exc.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: exc.h,v 1.24 2013-11-22 20:51:31 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/fdset.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/fdset.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/fdset.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2002 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001, 2002 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: fdset.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: fdset.h,v 1.6 2013-11-22 20:51:31 ca Exp $
*/
#ifndef SM_FDSET_H
@@ -17,9 +17,9 @@
** before.
*/
-# define SM_FD_SET(fd, pfdset) FD_SET(fd, pfdset)
-# define SM_FD_ISSET(fd, pfdset) FD_ISSET(fd, pfdset)
-# define SM_FD_SETSIZE FD_SETSIZE
-# define SM_FD_OK_SELECT(fd) (FD_SETSIZE <= 0 || (fd) < FD_SETSIZE)
+#define SM_FD_SET(fd, pfdset) FD_SET(fd, pfdset)
+#define SM_FD_ISSET(fd, pfdset) FD_ISSET(fd, pfdset)
+#define SM_FD_SETSIZE FD_SETSIZE
+#define SM_FD_OK_SELECT(fd) (SM_FD_SETSIZE <= 0 || (fd) < SM_FD_SETSIZE)
#endif /* SM_FDSET_H */
Modified: stable/0.8/contrib/sendmail/include/sm/gen.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/gen.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/gen.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2002 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: gen.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: gen.h,v 1.24 2013-11-22 20:51:31 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/heap.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/heap.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/heap.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001, 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: heap.h,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+ * $Id: heap.h,v 1.24 2013-11-22 20:51:31 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/io.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/io.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/io.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2002, 2004, 2013 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2002, 2004, 2013 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990
* The Regents of the University of California. All rights reserved.
@@ -11,7 +11,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: io.h,v 1.1.1.3 2013-08-14 22:35:47 laffer1 Exp $
+ * $Id: io.h,v 1.26 2013-11-22 20:51:31 ca Exp $
*/
/*-
Modified: stable/0.8/contrib/sendmail/include/sm/ldap.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/ldap.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/ldap.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001-2003, 2005-2007 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001-2003, 2005-2007 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: ldap.h,v 1.1.1.5 2010-01-10 20:14:36 laffer1 Exp $
+ * $Id: ldap.h,v 1.35 2013-11-22 20:51:31 ca Exp $
*/
#ifndef SM_LDAP_H
Modified: stable/0.8/contrib/sendmail/include/sm/limits.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/limits.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/limits.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: limits.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: limits.h,v 1.7 2013-11-22 20:51:31 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/mbdb.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/mbdb.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/mbdb.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001-2002 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001-2002 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: mbdb.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: mbdb.h,v 1.7 2013-11-22 20:51:31 ca Exp $
*/
#ifndef SM_MBDB_H
Modified: stable/0.8/contrib/sendmail/include/sm/misc.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/misc.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/misc.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: misc.h,v 1.1.1.1 2007-11-23 22:10:30 laffer1 Exp $
+ * $Id: misc.h,v 1.2 2013-11-22 20:51:31 ca Exp $
*/
#ifndef SM_MISC_H
Modified: stable/0.8/contrib/sendmail/include/sm/os/sm_os_aix.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/os/sm_os_aix.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/os/sm_os_aix.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001, 2003 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2003 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: sm_os_aix.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: sm_os_aix.h,v 1.12 2013-11-22 20:51:34 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/os/sm_os_dragonfly.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/os/sm_os_dragonfly.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/os/sm_os_dragonfly.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001, 2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2004 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: sm_os_dragonfly.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: sm_os_dragonfly.h,v 1.2 2013-11-22 20:51:34 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/os/sm_os_freebsd.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/os/sm_os_freebsd.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/os/sm_os_freebsd.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: sm_os_freebsd.h,v 1.2 2013-08-24 11:55:38 laffer1 Exp $
+ * $Id: sm_os_freebsd.h,v 1.12 2013-11-22 20:51:34 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/os/sm_os_hp.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/os/sm_os_hp.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/os/sm_os_hp.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: sm_os_hp.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: sm_os_hp.h,v 1.9 2013-11-22 20:51:34 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/os/sm_os_irix.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/os/sm_os_irix.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/os/sm_os_irix.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: sm_os_irix.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: sm_os_irix.h,v 1.8 2013-11-22 20:51:34 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/os/sm_os_linux.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/os/sm_os_linux.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/os/sm_os_linux.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: sm_os_linux.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: sm_os_linux.h,v 1.13 2013-11-22 20:51:34 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/os/sm_os_mpeix.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/os/sm_os_mpeix.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/os/sm_os_mpeix.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: sm_os_mpeix.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: sm_os_mpeix.h,v 1.3 2013-11-22 20:51:34 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/os/sm_os_next.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/os/sm_os_next.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/os/sm_os_next.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: sm_os_next.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: sm_os_next.h,v 1.8 2013-11-22 20:51:34 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/os/sm_os_openbsd.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/os/sm_os_openbsd.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/os/sm_os_openbsd.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: sm_os_openbsd.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: sm_os_openbsd.h,v 1.8 2013-11-22 20:51:34 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/os/sm_os_openunix.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/os/sm_os_openunix.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/os/sm_os_openunix.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: sm_os_openunix.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: sm_os_openunix.h,v 1.6 2013-11-22 20:51:34 ca Exp $
*/
#define SM_OS_NAME "openunix"
Modified: stable/0.8/contrib/sendmail/include/sm/os/sm_os_osf1.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/os/sm_os_osf1.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/os/sm_os_osf1.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: sm_os_osf1.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: sm_os_osf1.h,v 1.4 2013-11-22 20:51:34 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/os/sm_os_qnx.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/os/sm_os_qnx.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/os/sm_os_qnx.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2007 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: sm_os_qnx.h,v 1.1.1.1 2007-11-23 22:10:30 laffer1 Exp $
+ * $Id: sm_os_qnx.h,v 1.2 2013-11-22 20:51:34 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/os/sm_os_sunos.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/os/sm_os_sunos.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/os/sm_os_sunos.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: sm_os_sunos.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: sm_os_sunos.h,v 1.15 2013-11-22 20:51:34 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/os/sm_os_ultrix.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/os/sm_os_ultrix.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/os/sm_os_ultrix.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: sm_os_ultrix.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: sm_os_ultrix.h,v 1.4 2013-11-22 20:51:34 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/os/sm_os_unicos.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/os/sm_os_unicos.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/os/sm_os_unicos.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2003 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: sm_os_unicos.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: sm_os_unicos.h,v 1.2 2013-11-22 20:51:34 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/os/sm_os_unicosmk.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/os/sm_os_unicosmk.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/os/sm_os_unicosmk.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2003 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: sm_os_unicosmk.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: sm_os_unicosmk.h,v 1.2 2013-11-22 20:51:34 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/os/sm_os_unicosmp.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/os/sm_os_unicosmp.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/os/sm_os_unicosmp.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2003 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: sm_os_unicosmp.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: sm_os_unicosmp.h,v 1.2 2013-11-22 20:51:34 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/os/sm_os_unixware.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/os/sm_os_unixware.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/os/sm_os_unixware.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2002 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001, 2002 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: sm_os_unixware.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: sm_os_unixware.h,v 1.9 2013-11-22 20:51:34 ca Exp $
*/
#define SM_OS_NAME "unixware"
Modified: stable/0.8/contrib/sendmail/include/sm/path.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/path.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/path.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: path.h,v 1.1.1.2 2006-02-25 02:33:55 laffer1 Exp $
+ * $Id: path.h,v 1.7 2013-11-22 20:51:31 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/rpool.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/rpool.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/rpool.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001, 2003 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2003 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: rpool.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: rpool.h,v 1.17 2013-11-22 20:51:31 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/sem.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/sem.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/sem.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001, 2005, 2008 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2005, 2008 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: sem.h,v 1.1.1.3 2010-01-10 20:14:36 laffer1 Exp $
+ * $Id: sem.h,v 1.11 2013-11-22 20:51:31 ca Exp $
*/
#ifndef SM_SEM_H
Modified: stable/0.8/contrib/sendmail/include/sm/sendmail.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/sendmail.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/sendmail.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/include/sm/setjmp.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/setjmp.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/setjmp.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: setjmp.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: setjmp.h,v 1.4 2013-11-22 20:51:31 ca Exp $
*/
#ifndef SM_SETJMP_H
Modified: stable/0.8/contrib/sendmail/include/sm/shm.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/shm.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/shm.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2003, 2005 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2003, 2005 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: shm.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: shm.h,v 1.12 2013-11-22 20:51:31 ca Exp $
*/
#ifndef SM_SHM_H
Modified: stable/0.8/contrib/sendmail/include/sm/signal.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/signal.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/signal.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -9,7 +9,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: signal.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: signal.h,v 1.17 2013-11-22 20:51:31 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/string.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/string.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/string.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001, 2003 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2003 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: string.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: string.h,v 1.39 2013-11-22 20:51:31 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/sysexits.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/sysexits.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/sysexits.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.
@@ -8,7 +8,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: sysexits.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: sysexits.h,v 1.6 2013-11-22 20:51:31 ca Exp $
* @(#)sysexits.h 8.1 (Berkeley) 6/2/93
*/
Modified: stable/0.8/contrib/sendmail/include/sm/tailq.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/tailq.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/tailq.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -36,7 +36,7 @@
#define SM_TAILQ_H_
/*
- * $Id: tailq.h,v 1.1.1.2 2013-08-14 22:35:47 laffer1 Exp $
+ * $Id: tailq.h,v 1.3 2012-01-21 00:12:14 ashish Exp $
*
* This file is a modified copy of queue.h from a BSD system:
* we only need tail queues here.
Modified: stable/0.8/contrib/sendmail/include/sm/test.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/test.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/test.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: test.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: test.h,v 1.7 2013-11-22 20:51:32 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/time.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/time.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/time.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2005 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: time.h,v 1.1.1.1 2006-08-04 02:03:05 laffer1 Exp $
+ * $Id: time.h,v 1.2 2013-11-22 20:51:32 ca Exp $
*/
#ifndef SM_TIME_H
Modified: stable/0.8/contrib/sendmail/include/sm/types.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/types.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/types.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: types.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: types.h,v 1.14 2013-11-22 20:51:32 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/varargs.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/varargs.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/varargs.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: varargs.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: varargs.h,v 1.9 2013-11-22 20:51:32 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/include/sm/xtrap.h
===================================================================
--- stable/0.8/contrib/sendmail/include/sm/xtrap.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/include/sm/xtrap.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: xtrap.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: xtrap.h,v 1.8 2013-11-22 20:51:32 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/libmilter/Makefile
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/Makefile 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/Makefile 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+# $Id: Makefile,v 8.2 2006-05-23 21:55:55 ca Exp $
SHELL= /bin/sh
BUILD= ./Build
Modified: stable/0.8/contrib/sendmail/libmilter/Makefile.m4
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/Makefile.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/Makefile.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-dnl $Id: Makefile.m4,v 1.1.1.6 2013-08-14 22:35:47 laffer1 Exp $
+dnl $Id: Makefile.m4,v 8.96 2013-10-14 16:16:44 ca Exp $
include(confBUILDTOOLSDIR`/M4/switch.m4')
dnl only required for compilation of EXTRAS
Modified: stable/0.8/contrib/sendmail/libmilter/README
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/README 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/README 2016-10-01 17:46:48 UTC (rev 9102)
@@ -231,4 +231,4 @@
systems. You should check your system man pages for the functions used
below to verify the functions are thread safe.
-$Revision: 1.1.1.4 $, Last updated $Date: 2007-11-23 22:10:30 $
+$Revision: 8.42 $, Last updated $Date: 2006-06-29 17:10:16 $
Modified: stable/0.8/contrib/sendmail/libmilter/comm.c
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/comm.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/comm.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2004, 2009 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2004, 2009 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: comm.c,v 1.1.1.4 2010-01-10 20:14:37 laffer1 Exp $")
+SM_RCSID("@(#)$Id: comm.c,v 8.71 2013-11-22 20:51:36 ca Exp $")
#include "libmilter.h"
#include <sm/errstring.h>
Modified: stable/0.8/contrib/sendmail/libmilter/docs/api.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/api.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/api.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>Milter API</TITLE></HEAD>
<BODY>
<!--
-$Id: api.html,v 1.1.1.5 2013-08-14 22:35:47 laffer1 Exp $
+$Id: api.html,v 1.39 2013-11-22 20:51:39 ca Exp $
-->
<H1>Milter API</H1>
@@ -311,7 +311,7 @@
<HR SIZE="1">
<FONT SIZE="-1">
-Copyright (c) 2000, 2003, 2006, 2009 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000, 2003, 2006, 2009 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/design.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/design.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/design.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -4,7 +4,7 @@
</HEAD>
<BODY>
<!--
-$Id: design.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: design.html,v 1.13 2013-11-22 20:51:39 ca Exp $
-->
<H1>Architecture</H1>
@@ -137,7 +137,7 @@
</DIV>
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000, 2003 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000, 2003 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/index.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/index.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/index.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -4,7 +4,7 @@
</HEAD>
<BODY>
<!--
-$Id: index.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: index.html,v 1.14 2013-11-22 20:51:39 ca Exp $
-->
<H1>Filtering Mail with Sendmail</H1>
@@ -82,7 +82,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000, 2001, 2003 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000, 2001, 2003 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/installation.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/installation.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/installation.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -3,7 +3,7 @@
</HEAD>
<BODY>
<!--
-$Id: installation.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: installation.html,v 1.24 2013-11-22 20:51:39 ca Exp $
-->
<H1>Installation</H1>
<H2>Contents</H2>
@@ -155,7 +155,7 @@
consult the sendmail documentation.
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000-2003, 2006 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000-2003, 2006 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/other.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/other.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/other.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -3,12 +3,12 @@
</HEAD>
<BODY>
<!--
-$Id: other.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: other.html,v 1.7 2013-11-22 20:51:39 ca Exp $
-->
FAQ? Mailing list? More sample filters?
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000, 2003 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000, 2003 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/overview.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/overview.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/overview.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -4,7 +4,7 @@
</HEAD>
<BODY>
<!--
-$Id: overview.html,v 1.1.1.5 2011-05-17 22:19:51 laffer1 Exp $
+$Id: overview.html,v 1.22 2013-11-22 20:51:39 ca Exp $
-->
<H1>Technical Overview</H1>
@@ -207,7 +207,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000, 2001, 2003, 2006 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000, 2001, 2003, 2006 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/sample.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/sample.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/sample.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>A Sample Filter</TITLE></HEAD>
<BODY>
<!--
-$Id: sample.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: sample.html,v 1.23 2013-11-22 20:51:39 ca Exp $
-->
<H1>A Sample Filter</H1>
@@ -527,7 +527,7 @@
</PRE>
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000-2004, 2006 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000-2004, 2006 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_addheader.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_addheader.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_addheader.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_addheader</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_addheader.html,v 1.1.1.4 2010-01-10 20:14:37 laffer1 Exp $
+$Id: smfi_addheader.html,v 1.21 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_addheader</H1>
@@ -120,7 +120,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000-2003, 2006, 2009 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000-2003, 2006, 2009 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_addrcpt.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_addrcpt.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_addrcpt.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_addrcpt</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_addrcpt.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: smfi_addrcpt.html,v 1.12 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_addrcpt</H1>
@@ -73,7 +73,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000, 2003 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000, 2003 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_addrcpt_par</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_addrcpt_par.html,v 1.1.1.1 2007-11-23 22:10:30 laffer1 Exp $
+$Id: smfi_addrcpt_par.html,v 1.5 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_addrcpt_par</H1>
@@ -78,7 +78,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2006 Sendmail, Inc. and its suppliers.
+Copyright (c) 2006 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_chgfrom.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_chgfrom.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_chgfrom.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_chgfrom</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_chgfrom.html,v 1.1.1.1 2007-11-23 22:10:30 laffer1 Exp $
+$Id: smfi_chgfrom.html,v 1.4 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_chgfrom</H1>
@@ -84,7 +84,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2006 Sendmail, Inc. and its suppliers.
+Copyright (c) 2006 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_chgheader.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_chgheader.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_chgheader.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_chgheader</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_chgheader.html,v 1.1.1.4 2010-01-10 20:14:37 laffer1 Exp $
+$Id: smfi_chgheader.html,v 1.19 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_chgheader</H1>
@@ -115,7 +115,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000-2003, 2009 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000-2003, 2009 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_delrcpt.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_delrcpt.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_delrcpt.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_delrcpt</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_delrcpt.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: smfi_delrcpt.html,v 1.12 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_delrcpt</H1>
@@ -72,7 +72,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000, 2003 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000, 2003 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_getpriv.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_getpriv.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_getpriv.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_getpriv</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_getpriv.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: smfi_getpriv.html,v 1.10 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_getpriv</H1>
@@ -52,7 +52,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000, 2003 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000, 2003 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_getsymval.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_getsymval.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_getsymval.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_getsymval</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_getsymval.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: smfi_getsymval.html,v 1.16 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_getsymval</H1>
@@ -95,7 +95,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000, 2002-2003, 2007 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000, 2002-2003, 2007 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_insheader.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_insheader.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_insheader.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_insheader</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_insheader.html,v 1.1.1.4 2010-01-10 20:14:37 laffer1 Exp $
+$Id: smfi_insheader.html,v 1.11 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_insheader</H1>
@@ -140,7 +140,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2004, 2006, 2009 Sendmail, Inc. and its suppliers.
+Copyright (c) 2004, 2006, 2009 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_main.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_main.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_main.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_main</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_main.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: smfi_main.html,v 1.10 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_main</H1>
@@ -41,7 +41,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000, 2003 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000, 2003 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_opensocket.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_opensocket.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_opensocket.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_opensocket</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_opensocket.html,v 1.1.1.4 2008-05-28 21:04:01 laffer1 Exp $
+$Id: smfi_opensocket.html,v 1.8 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_opensocket</H1>
@@ -74,7 +74,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2003, 2008 Sendmail, Inc. and its suppliers.
+Copyright (c) 2003, 2008 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_progress.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_progress.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_progress.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_progress</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_progress.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: smfi_progress.html,v 1.6 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_progress</H1>
@@ -58,7 +58,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2003 Sendmail, Inc. and its suppliers.
+Copyright (c) 2003 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_quarantine.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_quarantine.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_quarantine.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_quarantine</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_quarantine.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: smfi_quarantine.html,v 1.6 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_quarantine</H1>
@@ -63,7 +63,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2002-2003 Sendmail, Inc. and its suppliers.
+Copyright (c) 2002-2003 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_register.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_register.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_register.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_register</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_register.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: smfi_register.html,v 1.19 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_register</H1>
@@ -214,7 +214,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000-2001, 2003, 2006 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000-2001, 2003, 2006 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_replacebody.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_replacebody.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_replacebody.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_replacebody</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_replacebody.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: smfi_replacebody.html,v 1.16 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_replacebody</H1>
@@ -83,7 +83,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000-2001, 2003 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000-2001, 2003 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_setbacklog.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_setbacklog.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_setbacklog.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_setbacklog</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_setbacklog.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: smfi_setbacklog.html,v 1.7 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_setbacklog</H1>
@@ -54,7 +54,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2002-2003 Sendmail, Inc. and its suppliers.
+Copyright (c) 2002-2003 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_setconn.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_setconn.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_setconn.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_setconn</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_setconn.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: smfi_setconn.html,v 1.18 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_setconn</H1>
@@ -83,7 +83,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000, 2003 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000, 2003 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_setdbg.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_setdbg.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_setdbg.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_setdbg</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_setdbg.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: smfi_setdbg.html,v 1.4 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_setdbg</H1>
@@ -57,7 +57,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2003 Sendmail, Inc. and its suppliers.
+Copyright (c) 2003 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_setmlreply.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_setmlreply.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_setmlreply.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_setmlreply</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_setmlreply.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: smfi_setmlreply.html,v 1.5 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_setmlreply</H1>
@@ -135,7 +135,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000, 2002-2003 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000, 2002-2003 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_setpriv.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_setpriv.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_setpriv.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_setpriv</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_setpriv.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: smfi_setpriv.html,v 1.12 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_setpriv</H1>
@@ -70,7 +70,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000-2001, 2003 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000-2001, 2003 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_setreply.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_setreply.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_setreply.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_setreply</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_setreply.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: smfi_setreply.html,v 1.18 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_setreply</H1>
@@ -107,7 +107,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000, 2002-2003 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000, 2002-2003 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_setsymlist.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_setsymlist.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_setsymlist.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_setsymlist</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_setsymlist.html,v 1.1.1.2 2013-08-14 22:35:47 laffer1 Exp $
+$Id: smfi_setsymlist.html,v 1.7 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_setsymlist</H1>
@@ -62,6 +62,9 @@
<TR><TD>macros</TD>
<TD>list of macros (separated by space).
Example: "{rcpt_mailer} {rcpt_host}"
+ <BR>
+ An empty string ("", not NULL) can be used to specify that no macros
+ should be sent.
</TD></TR>
</TABLE>
@@ -74,7 +77,7 @@
<TD>MI_FAILURE is returned if
<UL>
<LI>there is not enough free memory to make a copy of the macro list,
-<LI><CODE>macros</CODE> is <CODE>NULL</CODE> or empty,
+<LI><CODE>macros</CODE> is <CODE>NULL</CODE>,
<LI><CODE>stage</CODE> is not a valid protocol stage,
<LI>the macro list for
<CODE>stage</CODE> has been set before.
@@ -99,7 +102,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2006, 2012 Sendmail, Inc. and its suppliers.
+Copyright (c) 2006, 2012 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_settimeout.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_settimeout.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_settimeout.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_settimeout</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_settimeout.html,v 1.1.1.4 2013-08-14 22:35:47 laffer1 Exp $
+$Id: smfi_settimeout.html,v 1.16 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_settimeout</H1>
@@ -69,7 +69,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000, 2002-2003, 2006, 2011 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000, 2002-2003, 2006, 2011 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_stop.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_stop.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_stop.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_stop</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_stop.html,v 1.1.1.5 2011-05-17 22:19:51 laffer1 Exp $
+$Id: smfi_stop.html,v 1.8 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_stop</H1>
@@ -64,7 +64,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2003, 2005 Sendmail, Inc. and its suppliers.
+Copyright (c) 2003, 2005 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/smfi_version.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/smfi_version.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/smfi_version.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>smfi_version()</TITLE></HEAD>
<BODY>
<!--
-$Id: smfi_version.html,v 1.1.1.2 2008-05-28 21:04:01 laffer1 Exp $
+$Id: smfi_version.html,v 1.7 2013-11-22 20:51:39 ca Exp $
-->
<H1>smfi_version()</H1>
@@ -82,7 +82,7 @@
<HR SIZE="1">
<FONT SIZE="-1">
-Copyright (c) 2006-2008 Sendmail, Inc. and its suppliers.
+Copyright (c) 2006-2008 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/xxfi_abort.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/xxfi_abort.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/xxfi_abort.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>xxfi_abort</TITLE></HEAD>
<BODY>
<!--
-$Id: xxfi_abort.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: xxfi_abort.html,v 1.13 2013-11-22 20:51:39 ca Exp $
-->
<H1>xxfi_abort</H1>
@@ -73,7 +73,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000, 2003 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000, 2003 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/xxfi_body.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/xxfi_body.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/xxfi_body.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>xxfi_body</TITLE></HEAD>
<BODY>
<!--
-$Id: xxfi_body.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: xxfi_body.html,v 1.18 2013-11-22 20:51:39 ca Exp $
-->
<H1>xxfi_body</H1>
@@ -87,7 +87,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000-2003, 2007 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000-2003, 2007 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/xxfi_close.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/xxfi_close.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/xxfi_close.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>xxfi_close</TITLE></HEAD>
<BODY>
<!--
-$Id: xxfi_close.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: xxfi_close.html,v 1.14 2013-11-22 20:51:39 ca Exp $
-->
<H1>xxfi_close</H1>
@@ -71,7 +71,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000, 2003, 2004 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000, 2003, 2004 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/xxfi_connect.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/xxfi_connect.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/xxfi_connect.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>xxfi_connect</TITLE></HEAD>
<BODY>
<!--
-$Id: xxfi_connect.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: xxfi_connect.html,v 1.20 2013-11-22 20:51:39 ca Exp $
-->
<H1>xxfi_connect</H1>
@@ -111,7 +111,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000-2001, 2003, 2007 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000-2001, 2003, 2007 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/xxfi_data.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/xxfi_data.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/xxfi_data.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>xxfi_data</TITLE></HEAD>
<BODY>
<!--
-$Id: xxfi_data.html,v 1.1.1.1 2007-11-23 22:10:30 laffer1 Exp $
+$Id: xxfi_data.html,v 1.5 2013-11-22 20:51:39 ca Exp $
-->
<H1>xxfi_data</H1>
@@ -79,7 +79,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2006 Sendmail, Inc. and its suppliers.
+Copyright (c) 2006 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/xxfi_envfrom.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/xxfi_envfrom.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/xxfi_envfrom.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>xxfi_envfrom</TITLE></HEAD>
<BODY>
<!--
-$Id: xxfi_envfrom.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: xxfi_envfrom.html,v 1.15 2013-11-22 20:51:39 ca Exp $
-->
<H1>xxfi_envfrom</H1>
@@ -87,7 +87,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000, 2003, 2006 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000, 2003, 2006 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>xxfi_envrcpt</TITLE></HEAD>
<BODY>
<!--
-$Id: xxfi_envrcpt.html,v 1.1.1.4 2011-05-17 22:19:51 laffer1 Exp $
+$Id: xxfi_envrcpt.html,v 1.17 2013-11-22 20:51:39 ca Exp $
-->
<H1>xxfi_envrcpt</H1>
@@ -88,7 +88,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000, 2003, 2010 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000, 2003, 2010 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/xxfi_eoh.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/xxfi_eoh.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/xxfi_eoh.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>xxfi_eoh</TITLE></HEAD>
<BODY>
<!--
-$Id: xxfi_eoh.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: xxfi_eoh.html,v 1.12 2013-11-22 20:51:39 ca Exp $
-->
<H1>xxfi_eoh</H1>
@@ -46,7 +46,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000, 2003 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000, 2003 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/xxfi_eom.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/xxfi_eom.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/xxfi_eom.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>xxfi_eom</TITLE></HEAD>
<BODY>
<!--
-$Id: xxfi_eom.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+$Id: xxfi_eom.html,v 1.13 2013-11-22 20:51:39 ca Exp $
-->
<H1>xxfi_eom</H1>
@@ -52,7 +52,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000, 2003 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000, 2003 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/xxfi_header.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/xxfi_header.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/xxfi_header.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>xxfi_header</TITLE></HEAD>
<BODY>
<!--
-$Id: xxfi_header.html,v 1.1.1.4 2007-11-23 22:10:30 laffer1 Exp $
+$Id: xxfi_header.html,v 1.18 2013-11-22 20:51:39 ca Exp $
-->
<H1>xxfi_header</H1>
@@ -101,7 +101,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000, 2003, 2006 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000, 2003, 2006 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/xxfi_helo.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/xxfi_helo.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/xxfi_helo.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>xxfi_helo</TITLE></HEAD>
<BODY>
<!--
-$Id: xxfi_helo.html,v 1.1.1.4 2007-11-23 22:10:30 laffer1 Exp $
+$Id: xxfi_helo.html,v 1.13 2013-11-22 20:51:39 ca Exp $
-->
<H1>xxfi_helo</H1>
@@ -54,7 +54,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2000, 2003, 2005 Sendmail, Inc. and its suppliers.
+Copyright (c) 2000, 2003, 2005 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/xxfi_negotiate.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/xxfi_negotiate.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/xxfi_negotiate.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>xxfi_negotiate</TITLE></HEAD>
<BODY>
<!--
-$Id: xxfi_negotiate.html,v 1.1.1.1 2007-11-23 22:10:30 laffer1 Exp $
+$Id: xxfi_negotiate.html,v 1.24 2013-11-22 20:51:39 ca Exp $
-->
<H1>xxfi_negotiate</H1>
@@ -267,7 +267,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2006 Sendmail, Inc. and its suppliers.
+Copyright (c) 2006 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/docs/xxfi_unknown.html
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/docs/xxfi_unknown.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/docs/xxfi_unknown.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -2,7 +2,7 @@
<HEAD><TITLE>xxfi_unknown</TITLE></HEAD>
<BODY>
<!--
-$Id: xxfi_unknown.html,v 1.1.1.1 2007-11-23 22:10:30 laffer1 Exp $
+$Id: xxfi_unknown.html,v 1.5 2013-11-22 20:51:39 ca Exp $
-->
<H1>xxfi_unknown</H1>
@@ -74,7 +74,7 @@
<HR size="1">
<FONT size="-1">
-Copyright (c) 2006 Sendmail, Inc. and its suppliers.
+Copyright (c) 2006 Proofpoint, Inc. and its suppliers.
All rights reserved.
<BR>
By using this file, you agree to the terms and conditions set
Modified: stable/0.8/contrib/sendmail/libmilter/engine.c
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/engine.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/engine.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2004, 2006-2008 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2004, 2006-2008 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: engine.c,v 1.1.1.7 2011-05-17 22:19:51 laffer1 Exp $")
+SM_RCSID("@(#)$Id: engine.c,v 8.168 2013-11-22 20:51:36 ca Exp $")
#include "libmilter.h"
@@ -42,13 +42,8 @@
typedef struct cmdfct_t cmdfct;
/* possible values for cm_argt */
-#define CM_ARG0 0 /* no args */
-#define CM_ARG1 1 /* one arg (string) */
-#define CM_ARG2 2 /* two args (strings) */
-#define CM_ARGA 4 /* one string and _SOCK_ADDR */
-#define CM_ARGO 5 /* two integers */
-#define CM_ARGV 8 /* \0 separated list of args, NULL-terminated */
-#define CM_ARGN 9 /* \0 separated list of args (strings) */
+#define CM_BUF 0
+#define CM_NULLOK 1
/* possible values for cm_todo */
#define CT_CONT 0x0000 /* continue reading commands */
@@ -200,21 +195,21 @@
/* commands received by milter */
static cmdfct cmds[] =
{
- {SMFIC_ABORT, CM_ARG0, ST_ABRT, CT_CONT, CI_NONE, st_abortfct }
-, {SMFIC_MACRO, CM_ARGV, ST_NONE, CT_KEEP, CI_NONE, st_macros }
-, {SMFIC_BODY, CM_ARG1, ST_BODY, CT_CONT, CI_NONE, st_bodychunk }
-, {SMFIC_CONNECT, CM_ARG2, ST_CONN, CT_CONT, CI_CONN, st_connectinfo }
-, {SMFIC_BODYEOB, CM_ARG1, ST_ENDM, CT_CONT, CI_EOM, st_bodyend }
-, {SMFIC_HELO, CM_ARG1, ST_HELO, CT_CONT, CI_HELO, st_helo }
-, {SMFIC_HEADER, CM_ARG2, ST_HDRS, CT_CONT, CI_NONE, st_header }
-, {SMFIC_MAIL, CM_ARGV, ST_MAIL, CT_CONT, CI_MAIL, st_sender }
-, {SMFIC_OPTNEG, CM_ARGO, ST_OPTS, CT_CONT, CI_NONE, st_optionneg }
-, {SMFIC_EOH, CM_ARG0, ST_EOHS, CT_CONT, CI_EOH, st_eoh }
-, {SMFIC_QUIT, CM_ARG0, ST_QUIT, CT_END, CI_NONE, st_quit }
-, {SMFIC_DATA, CM_ARG0, ST_DATA, CT_CONT, CI_DATA, st_data }
-, {SMFIC_RCPT, CM_ARGV, ST_RCPT, CT_IGNO, CI_RCPT, st_rcpt }
-, {SMFIC_UNKNOWN, CM_ARG1, ST_UNKN, CT_IGNO, CI_NONE, st_unknown }
-, {SMFIC_QUIT_NC, CM_ARG0, ST_Q_NC, CT_CONT, CI_NONE, st_quit }
+ {SMFIC_ABORT, CM_NULLOK, ST_ABRT, CT_CONT, CI_NONE, st_abortfct}
+, {SMFIC_MACRO, CM_BUF, ST_NONE, CT_KEEP, CI_NONE, st_macros }
+, {SMFIC_BODY, CM_BUF, ST_BODY, CT_CONT, CI_NONE, st_bodychunk}
+, {SMFIC_CONNECT, CM_BUF, ST_CONN, CT_CONT, CI_CONN, st_connectinfo}
+, {SMFIC_BODYEOB, CM_NULLOK, ST_ENDM, CT_CONT, CI_EOM, st_bodyend }
+, {SMFIC_HELO, CM_BUF, ST_HELO, CT_CONT, CI_HELO, st_helo }
+, {SMFIC_HEADER, CM_BUF, ST_HDRS, CT_CONT, CI_NONE, st_header }
+, {SMFIC_MAIL, CM_BUF, ST_MAIL, CT_CONT, CI_MAIL, st_sender }
+, {SMFIC_OPTNEG, CM_BUF, ST_OPTS, CT_CONT, CI_NONE, st_optionneg}
+, {SMFIC_EOH, CM_NULLOK, ST_EOHS, CT_CONT, CI_EOH, st_eoh }
+, {SMFIC_QUIT, CM_NULLOK, ST_QUIT, CT_END, CI_NONE, st_quit }
+, {SMFIC_DATA, CM_NULLOK, ST_DATA, CT_CONT, CI_DATA, st_data }
+, {SMFIC_RCPT, CM_BUF, ST_RCPT, CT_IGNO, CI_RCPT, st_rcpt }
+, {SMFIC_UNKNOWN, CM_BUF, ST_UNKN, CT_IGNO, CI_NONE, st_unknown }
+, {SMFIC_QUIT_NC, CM_NULLOK, ST_Q_NC, CT_CONT, CI_NONE, st_quit }
};
/*
@@ -390,6 +385,15 @@
continue;
}
}
+ if (cmds[i].cm_argt != CM_NULLOK && buf == NULL)
+ {
+ /* stop for now */
+ if (ctx->ctx_dbg > 1)
+ sm_dprintf("[%lu] cmd='%c', buf=NULL\n",
+ (long) ctx->ctx_id, cmd);
+ ret = MI_FAILURE;
+ break;
+ }
arg.a_len = len;
arg.a_buf = buf;
if (newstate != ST_NONE)
@@ -726,7 +730,7 @@
}
/*
-** CLR_MACROS -- clear set of macros starting from a given index
+** MI_CLR_MACROS -- clear set of macros starting from a given index
**
** Parameters:
** ctx -- context structure
@@ -1816,7 +1820,7 @@
}
/*
-** SENDOK -- is it ok for the filter to send stuff to the MTA?
+** MI_SENDOK -- is it ok for the filter to send stuff to the MTA?
**
** Parameters:
** ctx -- context structure
Modified: stable/0.8/contrib/sendmail/libmilter/example.c
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/example.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/example.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: example.c,v 1.1.1.2 2010-01-10 20:14:37 laffer1 Exp $
+ * $Id: example.c,v 8.5 2013-11-22 20:51:36 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/libmilter/handler.c
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/handler.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/handler.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2003, 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2003, 2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,13 +9,13 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: handler.c,v 1.1.1.4 2010-01-10 20:14:37 laffer1 Exp $")
+SM_RCSID("@(#)$Id: handler.c,v 8.40 2013-11-22 20:51:36 ca Exp $")
#include "libmilter.h"
#if !_FFR_WORKERS_POOL
/*
-** HANDLE_SESSION -- Handle a connected session in its own context
+** MI_HANDLE_SESSION -- Handle a connected session in its own context
**
** Parameters:
** ctx -- context structure
Modified: stable/0.8/contrib/sendmail/libmilter/libmilter.h
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/libmilter.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/libmilter.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2003, 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2003, 2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -19,7 +19,7 @@
#ifdef _DEFINE
# define EXTERN
# define INIT(x) = x
-SM_IDSTR(MilterlId, "@(#)$Id: libmilter.h,v 1.1.1.5 2010-01-10 20:14:37 laffer1 Exp $")
+SM_IDSTR(MilterlId, "@(#)$Id: libmilter.h,v 8.78 2013-11-22 20:51:36 ca Exp $")
#else /* _DEFINE */
# define EXTERN extern
# define INIT(x)
Modified: stable/0.8/contrib/sendmail/libmilter/listener.c
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/listener.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/listener.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2007 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2007 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: listener.c,v 1.1.1.5 2010-01-10 20:14:37 laffer1 Exp $")
+SM_RCSID("@(#)$Id: listener.c,v 8.127 2013-11-22 20:51:36 ca Exp $")
/*
** listener.c -- threaded network listener
@@ -728,6 +728,7 @@
int acnt = 0; /* error count for accept() failures */
int scnt = 0; /* error count for select() failures */
int save_errno = 0;
+ int fdflags;
#if !_FFR_WORKERS_POOL
sthread_t thread_id;
#endif /* !_FFR_WORKERS_POOL */
@@ -885,6 +886,20 @@
}
#endif /* _FFR_DUP_FD */
+ /*
+ ** Need to set close-on-exec for connfd in case a user's
+ ** filter starts other applications.
+ ** Note: errors will not stop processing (for now).
+ */
+
+ if ((fdflags = fcntl(connfd, F_GETFD, 0)) == -1 ||
+ fcntl(connfd, F_SETFD, fdflags | FD_CLOEXEC) == -1)
+ {
+ smi_log(SMI_LOG_ERR,
+ "%s: Unable to set close-on-exec: %s",
+ smfi->xxfi_name, sm_errstring(errno));
+ }
+
if (setsockopt(connfd, SOL_SOCKET, SO_KEEPALIVE,
(void *) &sockopt, sizeof sockopt) < 0)
{
Modified: stable/0.8/contrib/sendmail/libmilter/main.c
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/main.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/main.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2003, 2006, 2007 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2003, 2006, 2007 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: main.c,v 1.1.1.4 2010-01-10 20:14:37 laffer1 Exp $")
+SM_RCSID("@(#)$Id: main.c,v 8.85 2013-11-22 20:51:36 ca Exp $")
#define _DEFINE 1
#include "libmilter.h"
Modified: stable/0.8/contrib/sendmail/libmilter/monitor.c
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/monitor.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/monitor.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: monitor.c,v 1.1.1.1 2007-11-23 22:10:30 laffer1 Exp $")
+SM_RCSID("@(#)$Id: monitor.c,v 8.8 2013-11-22 20:51:36 ca Exp $")
#include "libmilter.h"
#if _FFR_THREAD_MONITOR
Modified: stable/0.8/contrib/sendmail/libmilter/signal.c
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/signal.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/signal.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2004, 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2004, 2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: signal.c,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $")
+SM_RCSID("@(#)$Id: signal.c,v 8.45 2013-11-22 20:51:36 ca Exp $")
#include "libmilter.h"
@@ -104,11 +104,11 @@
for (;;)
{
sigerr = sig = 0;
-#if defined(SOLARIS) || defined(__svr5__)
+#if SIGWAIT_TAKES_1_ARG
if ((sig = sigwait(&set)) < 0)
-#else /* defined(SOLARIS) || defined(__svr5__) */
+#else
if ((sigerr = sigwait(&set, &sig)) != 0)
-#endif /* defined(SOLARIS) || defined(__svr5__) */
+#endif
{
/* some OS return -1 and set errno: copy it */
if (sigerr <= 0)
Modified: stable/0.8/contrib/sendmail/libmilter/sm_gethost.c
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/sm_gethost.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/sm_gethost.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2001, 2004, 2010, 2013 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2001, 2004, 2010, 2013 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: sm_gethost.c,v 1.1.1.4 2013-08-14 22:35:47 laffer1 Exp $")
+SM_RCSID("@(#)$Id: sm_gethost.c,v 8.32 2013-11-22 20:51:36 ca Exp $")
#include <sendmail.h>
#if NETINET || NETINET6
@@ -62,7 +62,18 @@
h = gethostbyname(name);
if (family == AF_INET6 && !resv6)
_res.options &= ~RES_USE_INET6;
- *err = h_errno;
+
+ /* the function is supposed to return only the requested family */
+ if (h != NULL && h->h_addrtype != family)
+ {
+# if NETINET6
+ freehostent(h);
+# endif /* NETINET6 */
+ h = NULL;
+ *err = NO_DATA;
+ }
+ else
+ *err = h_errno;
return h;
}
@@ -121,6 +132,16 @@
# endif /* NETINET6 */
#endif /* (SOLARIS > 10000 && SOLARIS < 20400) || (defined(SOLARIS) && SOLARIS < 204) || (defined(sony_news) && defined(__svr4)) */
+
+ /* the function is supposed to return only the requested family */
+ if (h != NULL && h->h_addrtype != family)
+ {
+# if NETINET6
+ freehostent(h);
+# endif /* NETINET6 */
+ h = NULL;
+ SM_SET_H_ERRNO(NO_DATA);
+ }
return h;
}
Modified: stable/0.8/contrib/sendmail/libmilter/smfi.c
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/smfi.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/smfi.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2007 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2007 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: smfi.c,v 1.1.1.4 2007-11-23 22:10:30 laffer1 Exp $")
+SM_RCSID("@(#)$Id: smfi.c,v 8.84 2013-11-22 20:51:36 ca Exp $")
#include <sm/varargs.h>
#include "libmilter.h"
@@ -325,7 +325,7 @@
{
SM_ASSERT(ctx != NULL);
- if (macros == NULL || *macros == '\0')
+ if (macros == NULL)
return MI_FAILURE;
if (where < SMFIM_FIRST || where > SMFIM_LAST)
return MI_FAILURE;
Modified: stable/0.8/contrib/sendmail/libmilter/worker.c
===================================================================
--- stable/0.8/contrib/sendmail/libmilter/worker.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libmilter/worker.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003-2004, 2007, 2009-2012 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2003-2004, 2007, 2009-2012 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -11,7 +11,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: worker.c,v 1.1.1.5 2013-08-14 22:35:47 laffer1 Exp $")
+SM_RCSID("@(#)$Id: worker.c,v 8.25 2013-11-22 20:51:37 ca Exp $")
#include "libmilter.h"
@@ -254,7 +254,7 @@
}
/*
-** MI_POOL_CONTROLER_INIT -- Launch the worker pool controller
+** MI_POOL_CONTROLLER_INIT -- Launch the worker pool controller
** Must be called before starting sessions.
**
** Parameters:
Modified: stable/0.8/contrib/sendmail/libsm/Makefile
===================================================================
--- stable/0.8/contrib/sendmail/libsm/Makefile 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/Makefile 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+# $Id: Makefile,v 1.2 2006-08-16 21:06:30 ca Exp $
SHELL= /bin/sh
BUILD= ./Build
Modified: stable/0.8/contrib/sendmail/libsm/Makefile.m4
===================================================================
--- stable/0.8/contrib/sendmail/libsm/Makefile.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/Makefile.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-dnl $Id: Makefile.m4,v 1.1.1.5 2013-08-14 22:35:47 laffer1 Exp $
+dnl $Id: Makefile.m4,v 1.75 2013-08-27 19:02:10 ca Exp $
define(`confREQUIRE_LIBUNIX')
include(confBUILDTOOLSDIR`/M4/switch.m4')
@@ -6,7 +6,7 @@
define(`confREQUIRE_SM_OS_H', `true')
PREPENDDEF(`confENVDEF', `confMAPDEF')
bldPRODUCT_START(`library', `libsm')
-define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strerror.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c memstat.c util.c ')
+define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strerror.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c memstat.c util.c inet6_ntop.c ')
bldPRODUCT_END
dnl msg.c
dnl syslogio.c
@@ -31,6 +31,7 @@
smcheck(`t-scanf', `compile-run')
smcheck(`t-shm', `compile-run')
smcheck(`t-sem', `compile-run')
+smcheck(`t-inet6_ntop', `compile-run')
dnl smcheck(`t-msg', `compile-run')
smcheck(`t-cf')
smcheck(`b-strcmp')
Modified: stable/0.8/contrib/sendmail/libsm/README
===================================================================
--- stable/0.8/contrib/sendmail/libsm/README 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/README 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000-2002 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -5,7 +5,7 @@
# forth in the LICENSE file which can be found at the top level of
# the sendmail distribution.
#
-# $Id: README,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+# $Id: README,v 1.25 2013-11-22 20:51:42 ca Exp $
#
Libsm is a library of generally useful C abstractions.
Modified: stable/0.8/contrib/sendmail/libsm/assert.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/assert.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/assert.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: assert.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: assert.c,v 1.27 2013-11-22 20:51:42 ca Exp $")
/*
** Abnormal program termination and assertion checking.
Modified: stable/0.8/contrib/sendmail/libsm/assert.html
===================================================================
--- stable/0.8/contrib/sendmail/libsm/assert.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/assert.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -8,7 +8,7 @@
<center>
<h1> libsm : Assert and Abort </h1>
- <br> $Id: assert.html,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ <br> $Id: assert.html,v 1.6 2001-08-27 21:47:03 ca Exp $
</center>
<h2> Introduction </h2>
Modified: stable/0.8/contrib/sendmail/libsm/b-strcmp.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/b-strcmp.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/b-strcmp.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001, 2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2004 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: b-strcmp.c,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $")
+SM_RCSID("@(#)$Id: b-strcmp.c,v 1.15 2013-11-22 20:51:42 ca Exp $")
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
Modified: stable/0.8/contrib/sendmail/libsm/b-strl.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/b-strl.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/b-strl.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -19,7 +19,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: b-strl.c,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $")
+SM_RCSID("@(#)$Id: b-strl.c,v 1.26 2013-11-22 20:51:42 ca Exp $")
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
Modified: stable/0.8/contrib/sendmail/libsm/cdefs.html
===================================================================
--- stable/0.8/contrib/sendmail/libsm/cdefs.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/cdefs.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -8,7 +8,7 @@
<center>
<h1> libsm : C Language Portability Macros </h1>
- <br> $Id: cdefs.html,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ <br> $Id: cdefs.html,v 1.2 2000-12-07 17:33:09 dmoen Exp $
</center>
<h2> Description </h2>
@@ -86,7 +86,7 @@
Examples:
<blockquote><pre>
-SM_UNUSED(static const char Id[]) = "@(#)$Id: cdefs.html,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $";
+SM_UNUSED(static const char Id[]) = "@(#)$Id: cdefs.html,v 1.2 2000-12-07 17:33:09 dmoen Exp $";
void
foo(x)
SM_UNUSED(int x);
Modified: stable/0.8/contrib/sendmail/libsm/cf.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/cf.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/cf.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: cf.c,v 1.1.1.3 2013-08-14 22:35:47 laffer1 Exp $")
+SM_RCSID("@(#)$Id: cf.c,v 1.8 2013-11-22 20:51:42 ca Exp $")
#include <ctype.h>
#include <errno.h>
Modified: stable/0.8/contrib/sendmail/libsm/clock.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/clock.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/clock.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2004 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -12,7 +12,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: clock.c,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $")
+SM_RCSID("@(#)$Id: clock.c,v 1.48 2013-11-22 20:51:42 ca Exp $")
#include <unistd.h>
#include <time.h>
#include <errno.h>
Modified: stable/0.8/contrib/sendmail/libsm/clrerr.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/clrerr.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/clrerr.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: clrerr.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: clrerr.c,v 1.14 2013-11-22 20:51:42 ca Exp $")
#include <sm/io.h>
#include <sm/assert.h>
#include "local.h"
Modified: stable/0.8/contrib/sendmail/libsm/config.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/config.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/config.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2003, 2007 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2003, 2007 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: config.c,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $")
+SM_RCSID("@(#)$Id: config.c,v 1.32 2013-11-22 20:51:42 ca Exp $")
#include <stdlib.h>
#include <sm/heap.h>
Modified: stable/0.8/contrib/sendmail/libsm/debug.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/debug.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/debug.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2001, 2003, 2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000, 2001, 2003, 2004 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: debug.c,v 1.1.1.3 2010-01-10 20:14:36 laffer1 Exp $")
+SM_RCSID("@(#)$Id: debug.c,v 1.33 2013-11-22 20:51:42 ca Exp $")
/*
** libsm debugging and tracing
Modified: stable/0.8/contrib/sendmail/libsm/debug.html
===================================================================
--- stable/0.8/contrib/sendmail/libsm/debug.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/debug.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -8,7 +8,7 @@
<center>
<h1> libsm : Debugging and Tracing </h1>
- <br> $Id: debug.html,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ <br> $Id: debug.html,v 1.9 2002-02-02 16:50:56 ca Exp $
</center>
<h2> Introduction </h2>
Modified: stable/0.8/contrib/sendmail/libsm/errstring.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/errstring.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/errstring.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2003 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001, 2003 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -11,7 +11,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: errstring.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: errstring.c,v 1.20 2013-11-22 20:51:42 ca Exp $")
#include <errno.h>
#include <stdio.h> /* sys_errlist, on some platforms */
@@ -264,10 +264,12 @@
#if LDAPMAP
/*
- ** LDAP error messages.
+ ** LDAP error messages. Handle small negative errors from
+ ** libldap (in the range -E_LDAP_SHIM to zero, offset by E_LDAPBASE)
+ ** as well.
*/
- if (errnum >= E_LDAPBASE)
+ if (errnum >= E_LDAPBASE - E_LDAP_SHIM)
return ldap_err2string(errnum - E_LDAPBASE);
#endif /* LDAPMAP */
Modified: stable/0.8/contrib/sendmail/libsm/exc.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/exc.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/exc.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2002 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: exc.c,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $")
+SM_RCSID("@(#)$Id: exc.c,v 1.50 2013-11-22 20:51:42 ca Exp $")
/*
** exception handling
Modified: stable/0.8/contrib/sendmail/libsm/exc.html
===================================================================
--- stable/0.8/contrib/sendmail/libsm/exc.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/exc.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -8,7 +8,7 @@
<center>
<h1> libsm : Exception Handling </h1>
- <br> $Id: exc.html,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+ <br> $Id: exc.html,v 1.13 2006-06-20 17:18:16 ca Exp $
</center>
<h2> Introduction </h2>
Modified: stable/0.8/contrib/sendmail/libsm/fclose.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/fclose.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/fclose.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2002, 2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2002, 2004 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: fclose.c,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $")
+SM_RCSID("@(#)$Id: fclose.c,v 1.45 2013-11-22 20:51:42 ca Exp $")
#include <errno.h>
#include <stdlib.h>
#include <sm/time.h>
Modified: stable/0.8/contrib/sendmail/libsm/feof.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/feof.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/feof.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: feof.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: feof.c,v 1.14 2013-11-22 20:51:42 ca Exp $")
#include <sm/io.h>
#include <sm/assert.h>
#include "local.h"
Modified: stable/0.8/contrib/sendmail/libsm/ferror.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/ferror.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/ferror.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: ferror.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: ferror.c,v 1.14 2013-11-22 20:51:42 ca Exp $")
#include <sm/io.h>
#include <sm/assert.h>
#include "local.h"
Modified: stable/0.8/contrib/sendmail/libsm/fflush.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/fflush.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/fflush.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001, 2005, 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2005, 2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: fflush.c,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $")
+SM_RCSID("@(#)$Id: fflush.c,v 1.46 2013-11-22 20:51:42 ca Exp $")
#include <unistd.h>
#include <errno.h>
#include <sm/time.h>
Modified: stable/0.8/contrib/sendmail/libsm/fget.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/fget.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/fget.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001, 2013 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2013 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: fget.c,v 1.1.1.3 2013-08-14 22:35:47 laffer1 Exp $")
+SM_RCSID("@(#)$Id: fget.c,v 1.26 2013-11-22 20:51:42 ca Exp $")
#include <stdlib.h>
#include <string.h>
#include <sm/io.h>
Modified: stable/0.8/contrib/sendmail/libsm/findfp.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/findfp.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/findfp.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2002, 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2002, 2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: findfp.c,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $")
+SM_RCSID("@(#)$Id: findfp.c,v 1.68 2013-11-22 20:51:42 ca Exp $")
#include <stdlib.h>
#include <unistd.h>
#include <sys/param.h>
Modified: stable/0.8/contrib/sendmail/libsm/flags.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/flags.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/flags.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001, 2004, 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2004, 2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: flags.c,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $")
+SM_RCSID("@(#)$Id: flags.c,v 1.24 2013-11-22 20:51:42 ca Exp $")
#include <sys/types.h>
#include <sys/file.h>
#include <errno.h>
Modified: stable/0.8/contrib/sendmail/libsm/fopen.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/fopen.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/fopen.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2002, 2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2002, 2004 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: fopen.c,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $")
+SM_RCSID("@(#)$Id: fopen.c,v 1.63 2013-11-22 20:51:42 ca Exp $")
#include <errno.h>
#include <setjmp.h>
#include <sm/time.h>
Modified: stable/0.8/contrib/sendmail/libsm/fpos.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/fpos.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/fpos.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001, 2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2004 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: fpos.c,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $")
+SM_RCSID("@(#)$Id: fpos.c,v 1.40 2013-11-22 20:51:42 ca Exp $")
#include <errno.h>
#include <setjmp.h>
#include <sm/time.h>
Modified: stable/0.8/contrib/sendmail/libsm/fprintf.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/fprintf.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/fprintf.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: fprintf.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: fprintf.c,v 1.18 2013-11-22 20:51:42 ca Exp $")
#include <sm/varargs.h>
#include <sm/io.h>
#include <sm/assert.h>
Modified: stable/0.8/contrib/sendmail/libsm/fpurge.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/fpurge.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/fpurge.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: fpurge.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: fpurge.c,v 1.21 2013-11-22 20:51:42 ca Exp $")
#include <stdlib.h>
#include <errno.h>
#include <sm/io.h>
Modified: stable/0.8/contrib/sendmail/libsm/fput.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/fput.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/fput.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: fput.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: fput.c,v 1.21 2013-11-22 20:51:42 ca Exp $")
#include <string.h>
#include <errno.h>
#include <sm/io.h>
Modified: stable/0.8/contrib/sendmail/libsm/fread.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/fread.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/fread.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: fread.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: fread.c,v 1.29 2013-11-22 20:51:42 ca Exp $")
#include <string.h>
#include <errno.h>
#include <sm/io.h>
Modified: stable/0.8/contrib/sendmail/libsm/fscanf.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/fscanf.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/fscanf.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: fscanf.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: fscanf.c,v 1.18 2013-11-22 20:51:42 ca Exp $")
#include <sm/varargs.h>
#include <sm/assert.h>
#include <sm/io.h>
Modified: stable/0.8/contrib/sendmail/libsm/fseek.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/fseek.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/fseek.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001, 2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2004 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: fseek.c,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $")
+SM_RCSID("@(#)$Id: fseek.c,v 1.48 2013-11-22 20:51:42 ca Exp $")
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
Modified: stable/0.8/contrib/sendmail/libsm/fvwrite.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/fvwrite.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/fvwrite.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: fvwrite.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: fvwrite.c,v 1.50 2013-11-22 20:51:42 ca Exp $")
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
Modified: stable/0.8/contrib/sendmail/libsm/fvwrite.h
===================================================================
--- stable/0.8/contrib/sendmail/libsm/fvwrite.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/fvwrite.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -11,7 +11,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: fvwrite.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: fvwrite.h,v 1.8 2013-11-22 20:51:43 ca Exp $
*/
/* I/O descriptors for sm_fvwrite() */
Modified: stable/0.8/contrib/sendmail/libsm/fwalk.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/fwalk.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/fwalk.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: fwalk.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: fwalk.c,v 1.22 2013-11-22 20:51:43 ca Exp $")
#include <errno.h>
#include <sm/io.h>
#include "local.h"
Modified: stable/0.8/contrib/sendmail/libsm/fwrite.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/fwrite.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/fwrite.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: fwrite.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: fwrite.c,v 1.25 2013-11-22 20:51:43 ca Exp $")
#include <errno.h>
#include <sm/io.h>
#include <sm/assert.h>
Modified: stable/0.8/contrib/sendmail/libsm/gen.html
===================================================================
--- stable/0.8/contrib/sendmail/libsm/gen.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/gen.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -8,7 +8,7 @@
<center>
<h1> libsm : General Definitions </h1>
- <br> $Id: gen.html,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ <br> $Id: gen.html,v 1.5 2000-12-08 21:41:42 ca Exp $
</center>
<h2> Introduction </h2>
Modified: stable/0.8/contrib/sendmail/libsm/get.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/get.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/get.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: get.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: get.c,v 1.19 2013-11-22 20:51:43 ca Exp $")
#include <sm/io.h>
#include <sm/assert.h>
#include "local.h"
Modified: stable/0.8/contrib/sendmail/libsm/glue.h
===================================================================
--- stable/0.8/contrib/sendmail/libsm/glue.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/glue.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -11,7 +11,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: glue.h,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ * $Id: glue.h,v 1.7 2013-11-22 20:51:43 ca Exp $
*/
/*
Modified: stable/0.8/contrib/sendmail/libsm/heap.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/heap.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/heap.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001, 2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2004 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: heap.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: heap.c,v 1.52 2013-11-22 20:51:43 ca Exp $")
/*
** debugging memory allocation package
Modified: stable/0.8/contrib/sendmail/libsm/heap.html
===================================================================
--- stable/0.8/contrib/sendmail/libsm/heap.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/heap.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -8,7 +8,7 @@
<center>
<h1> libsm : Memory Allocation </h1>
- <br> $Id: heap.html,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ <br> $Id: heap.html,v 1.9 2000-12-08 21:41:42 ca Exp $
</center>
<h2> Introduction </h2>
Modified: stable/0.8/contrib/sendmail/libsm/index.html
===================================================================
--- stable/0.8/contrib/sendmail/libsm/index.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/index.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -6,7 +6,7 @@
<center>
<h1> libsm Overview </h1>
- <br> $Id: index.html,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ <br> $Id: index.html,v 1.14 2001-02-13 21:21:25 gshapiro Exp $
</center>
<h2> Introduction </h2>
Copied: stable/0.8/contrib/sendmail/libsm/inet6_ntop.c (from rev 9097, trunk/contrib/sendmail/libsm/inet6_ntop.c)
===================================================================
--- stable/0.8/contrib/sendmail/libsm/inet6_ntop.c (rev 0)
+++ stable/0.8/contrib/sendmail/libsm/inet6_ntop.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2013 Proofpoint, Inc. and its suppliers.
+ * All rights reserved.
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the sendmail distribution.
+ *
+ */
+
+#include <sm/gen.h>
+SM_RCSID("@(#)$Id: inet6_ntop.c,v 1.2 2013-11-22 20:51:43 ca Exp $")
+
+#if NETINET6
+# include <sm/conf.h>
+# include <sm/types.h>
+# include <sm/io.h>
+# include <sm/string.h>
+# include <netinet/in.h>
+
+/*
+** SM_INET6_NTOP -- convert IPv6 address to ASCII string (uncompressed)
+**
+** Parameters:
+** ipv6 -- IPv6 address
+** dst -- ASCII representation of address (output)
+** len -- length of dst
+**
+** Returns:
+** error: NULL
+*/
+
+char *
+sm_inet6_ntop(ipv6, dst, len)
+ const void *ipv6;
+ char *dst;
+ size_t len;
+{
+ SM_UINT16 *u16;
+ int r;
+
+ u16 = (SM_UINT16 *)ipv6;
+ r = sm_snprintf(dst, len,
+ "%x:%x:%x:%x:%x:%x:%x:%x"
+ , htons(u16[0])
+ , htons(u16[1])
+ , htons(u16[2])
+ , htons(u16[3])
+ , htons(u16[4])
+ , htons(u16[5])
+ , htons(u16[6])
+ , htons(u16[7])
+ );
+ if (r > 0)
+ return dst;
+ return NULL;
+}
+#endif /* NETINET6 */
Modified: stable/0.8/contrib/sendmail/libsm/io.html
===================================================================
--- stable/0.8/contrib/sendmail/libsm/io.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/io.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -6,7 +6,7 @@
<a href="index.html">Back to libsm overview</a>
<center>
<h1>libsm sm_io general overview</h1>
-<br> $Id: io.html,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+<br> $Id: io.html,v 1.3 2001-03-17 03:22:50 gshapiro Exp $
</center>
<h2> Introduction </h2>
<p>
Modified: stable/0.8/contrib/sendmail/libsm/ldap.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/ldap.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/ldap.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001-2009 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001-2009 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -11,7 +11,7 @@
#define LDAP_DEPRECATED 1
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: ldap.c,v 1.1.1.6 2011-05-17 22:19:51 laffer1 Exp $")
+SM_RCSID("@(#)$Id: ldap.c,v 1.86 2013-11-22 20:51:43 ca Exp $")
#if LDAPMAP
# include <sys/types.h>
Modified: stable/0.8/contrib/sendmail/libsm/local.h
===================================================================
--- stable/0.8/contrib/sendmail/libsm/local.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/local.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2002, 2004-2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2002, 2004-2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -11,7 +11,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: local.h,v 1.1.1.4 2007-11-23 22:10:30 laffer1 Exp $
+ * $Id: local.h,v 1.59 2013-11-22 20:51:43 ca Exp $
*/
/*
@@ -20,6 +20,7 @@
*/
#include <sm/time.h>
+#include <sm/fdset.h>
#if !SM_CONF_MEMCHR
# include <memory.h>
#endif /* !SM_CONF_MEMCHR */
@@ -244,7 +245,7 @@
sm_io_to.tv_sec = (to) / 1000; \
sm_io_to.tv_usec = ((to) - (sm_io_to.tv_sec * 1000)) * 1000; \
} \
- if (FD_SETSIZE > 0 && (fd) >= FD_SETSIZE) \
+ if (!SM_FD_OK_SELECT(fd)) \
{ \
errno = EINVAL; \
return SM_IO_EOF; \
Modified: stable/0.8/contrib/sendmail/libsm/makebuf.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/makebuf.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/makebuf.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: makebuf.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: makebuf.c,v 1.27 2013-11-22 20:51:43 ca Exp $")
#include <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
Modified: stable/0.8/contrib/sendmail/libsm/match.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/match.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/match.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: match.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: match.c,v 1.11 2013-11-22 20:51:43 ca Exp $")
#include <sm/string.h>
Modified: stable/0.8/contrib/sendmail/libsm/mbdb.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/mbdb.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/mbdb.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001-2003,2009 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001-2003,2009 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: mbdb.c,v 1.1.1.3 2010-01-10 20:14:36 laffer1 Exp $")
+SM_RCSID("@(#)$Id: mbdb.c,v 1.43 2014-01-08 17:03:15 ca Exp $")
#include <sys/param.h>
@@ -315,7 +315,7 @@
{
struct passwd *pw;
-#ifdef HESIOD
+#if HESIOD && !HESIOD_ALLOW_NUMERIC_LOGIN
/* DEC Hesiod getpwnam accepts numeric strings -- short circuit it */
{
char *p;
@@ -326,29 +326,22 @@
if (*p == '\0')
return EX_NOUSER;
}
-#endif /* HESIOD */
+#endif /* HESIOD && !HESIOD_ALLOW_NUMERIC_LOGIN */
errno = 0;
pw = getpwnam(name);
if (pw == NULL)
{
-#if 0
+#if _FFR_USE_GETPWNAM_ERRNO
/*
- ** getpwnam() isn't advertised as setting errno.
- ** In fact, under FreeBSD, non-root getpwnam() on
- ** non-existant users returns NULL with errno = EPERM.
- ** This test won't work.
+ ** Only enable this code iff
+ ** user unknown <-> getpwnam() == NULL && errno == 0
+ ** (i.e., errno unchanged); see the POSIX spec.
*/
- switch (errno)
- {
- case 0:
- return EX_NOUSER;
- case EIO:
- return EX_OSERR;
- default:
+
+ if (errno != 0)
return EX_TEMPFAIL;
- }
-#endif /* 0 */
+#endif /* _FFR_USE_GETPWNAM_ERRNO */
return EX_NOUSER;
}
Modified: stable/0.8/contrib/sendmail/libsm/memstat.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/memstat.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/memstat.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005-2007 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2005-2007 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: memstat.c,v 1.1.1.2 2007-11-23 22:10:30 laffer1 Exp $")
+SM_RCSID("@(#)$Id: memstat.c,v 1.7 2013-11-22 20:51:43 ca Exp $")
#include <errno.h>
#include <sm/misc.h>
Modified: stable/0.8/contrib/sendmail/libsm/mpeix.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/mpeix.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/mpeix.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001-2002 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001-2002 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: mpeix.c,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $")
+SM_RCSID("@(#)$Id: mpeix.c,v 1.8 2013-11-22 20:51:43 ca Exp $")
#ifdef MPE
/*
Modified: stable/0.8/contrib/sendmail/libsm/niprop.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/niprop.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/niprop.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: niprop.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: niprop.c,v 1.9 2013-11-22 20:51:43 ca Exp $")
#if NETINFO
#include <ctype.h>
Modified: stable/0.8/contrib/sendmail/libsm/put.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/put.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/put.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: put.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: put.c,v 1.28 2013-11-22 20:51:43 ca Exp $")
#include <string.h>
#include <errno.h>
#include <sm/io.h>
Modified: stable/0.8/contrib/sendmail/libsm/refill.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/refill.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/refill.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001, 2005-2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2005-2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: refill.c,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $")
+SM_RCSID("@(#)$Id: refill.c,v 1.54 2013-11-22 20:51:43 ca Exp $")
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
@@ -25,6 +25,7 @@
#include <sm/io.h>
#include <sm/conf.h>
#include <sm/assert.h>
+#include <sm/fdset.h>
#include "local.h"
static int sm_lflush __P((SM_FILE_T *, int *));
@@ -65,7 +66,7 @@
errno = EAGAIN; \
return SM_IO_EOF; \
} \
- if (FD_SETSIZE > 0 && (fd) >= FD_SETSIZE) \
+ if (!SM_FD_OK_SELECT(fd)) \
{ \
errno = EINVAL; \
return SM_IO_EOF; \
Modified: stable/0.8/contrib/sendmail/libsm/rewind.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/rewind.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/rewind.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: rewind.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: rewind.c,v 1.19 2013-11-22 20:51:43 ca Exp $")
#include <errno.h>
#include <sm/io.h>
#include <sm/assert.h>
Modified: stable/0.8/contrib/sendmail/libsm/rpool.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/rpool.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/rpool.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2004 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: rpool.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: rpool.c,v 1.29 2013-11-22 20:51:43 ca Exp $")
/*
** resource pools
Modified: stable/0.8/contrib/sendmail/libsm/rpool.html
===================================================================
--- stable/0.8/contrib/sendmail/libsm/rpool.html 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/rpool.html 2016-10-01 17:46:48 UTC (rev 9102)
@@ -8,7 +8,7 @@
<center>
<h1> libsm : Resource Pools </h1>
- <br> $Id: rpool.html,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+ <br> $Id: rpool.html,v 1.4 2000-12-07 17:33:09 dmoen Exp $
</center>
<h2> Introduction </h2>
Modified: stable/0.8/contrib/sendmail/libsm/sem.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/sem.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/sem.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001, 2005, 2008 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2005, 2008 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: sem.c,v 1.1.1.4 2010-01-10 20:14:36 laffer1 Exp $")
+SM_RCSID("@(#)$Id: sem.c,v 1.15 2013-11-22 20:51:43 ca Exp $")
#if SM_CONF_SEM
# include <stdlib.h>
Modified: stable/0.8/contrib/sendmail/libsm/setvbuf.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/setvbuf.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/setvbuf.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: setvbuf.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: setvbuf.c,v 1.33 2013-11-22 20:51:43 ca Exp $")
#include <stdlib.h>
#include <errno.h>
#include <fcntl.h>
Modified: stable/0.8/contrib/sendmail/libsm/shm.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/shm.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/shm.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001, 2003, 2005 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2003, 2005 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: shm.c,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $")
+SM_RCSID("@(#)$Id: shm.c,v 1.20 2013-11-22 20:51:43 ca Exp $")
#if SM_CONF_SHM
# include <stdlib.h>
Modified: stable/0.8/contrib/sendmail/libsm/signal.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/signal.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/signal.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: signal.c,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $")
+SM_RCSID("@(#)$Id: signal.c,v 1.18 2013-11-22 20:51:43 ca Exp $")
#if SM_CONF_SETITIMER
# include <sm/time.h>
Modified: stable/0.8/contrib/sendmail/libsm/smstdio.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/smstdio.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/smstdio.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2002, 2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2002, 2004 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: smstdio.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: smstdio.c,v 1.35 2013-11-22 20:51:43 ca Exp $")
#include <unistd.h>
#include <stdio.h>
#include <fcntl.h>
Modified: stable/0.8/contrib/sendmail/libsm/snprintf.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/snprintf.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/snprintf.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: snprintf.c,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $")
+SM_RCSID("@(#)$Id: snprintf.c,v 1.25 2013-11-22 20:51:43 ca Exp $")
#include <limits.h>
#include <sm/varargs.h>
#include <sm/io.h>
Modified: stable/0.8/contrib/sendmail/libsm/sscanf.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/sscanf.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/sscanf.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: sscanf.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: sscanf.c,v 1.26 2013-11-22 20:51:43 ca Exp $")
#include <string.h>
#include <sm/varargs.h>
#include <sm/io.h>
Modified: stable/0.8/contrib/sendmail/libsm/stdio.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/stdio.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/stdio.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2005 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2005 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: stdio.c,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $")
+SM_RCSID("@(#)$Id: stdio.c,v 1.72 2013-11-22 20:51:43 ca Exp $")
#include <unistd.h>
#include <errno.h>
#include <fcntl.h>
@@ -317,7 +317,7 @@
}
/*
-** SM_GETINFO -- get information about the open file
+** SM_STDGETINFO -- get information about the open file
**
** Parameters:
** fp -- file to get info for
Modified: stable/0.8/contrib/sendmail/libsm/strcasecmp.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/strcasecmp.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/strcasecmp.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1987, 1988, 1993
@@ -12,7 +12,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: strcasecmp.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: strcasecmp.c,v 1.16 2013-11-22 20:51:43 ca Exp $")
#include <sm/config.h>
#include <sm/string.h>
Modified: stable/0.8/contrib/sendmail/libsm/strdup.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/strdup.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/strdup.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001, 2003 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2003 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: strdup.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: strdup.c,v 1.16 2013-11-22 20:51:43 ca Exp $")
#include <sm/heap.h>
#include <sm/string.h>
Modified: stable/0.8/contrib/sendmail/libsm/strerror.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/strerror.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/strerror.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -12,7 +12,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: strerror.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: strerror.c,v 1.24 2013-11-22 20:51:43 ca Exp $")
/*
** define strerror for platforms that lack it.
Modified: stable/0.8/contrib/sendmail/libsm/strexit.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/strexit.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/strexit.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: strexit.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: strexit.c,v 1.6 2013-11-22 20:51:43 ca Exp $")
#include <sm/string.h>
#include <sm/sysexits.h>
Modified: stable/0.8/contrib/sendmail/libsm/string.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/string.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/string.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: string.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: string.c,v 1.4 2013-11-22 20:51:43 ca Exp $")
#include <ctype.h>
#include <errno.h>
Modified: stable/0.8/contrib/sendmail/libsm/stringf.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/stringf.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/stringf.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: stringf.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: stringf.c,v 1.16 2013-11-22 20:51:43 ca Exp $")
#include <errno.h>
#include <stdio.h>
#include <sm/exc.h>
Modified: stable/0.8/contrib/sendmail/libsm/strio.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/strio.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/strio.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2002, 2004, 2005 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2002, 2004, 2005 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: strio.c,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: strio.c,v 1.45 2013-11-22 20:51:43 ca Exp $")
#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
Modified: stable/0.8/contrib/sendmail/libsm/strl.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/strl.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/strl.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2002 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2002 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: strl.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: strl.c,v 1.32 2013-11-22 20:51:43 ca Exp $")
#include <sm/config.h>
#include <sm/string.h>
Modified: stable/0.8/contrib/sendmail/libsm/strrevcmp.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/strrevcmp.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/strrevcmp.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: strrevcmp.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: strrevcmp.c,v 1.6 2013-11-22 20:51:43 ca Exp $")
#include <sm/config.h>
#include <sm/string.h>
Modified: stable/0.8/contrib/sendmail/libsm/strto.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/strto.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/strto.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1992
* The Regents of the University of California. All rights reserved.
@@ -10,7 +10,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: strto.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: strto.c,v 1.19 2013-11-22 20:51:43 ca Exp $")
#include <sys/param.h>
#include <sys/types.h>
Modified: stable/0.8/contrib/sendmail/libsm/syslogio.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/syslogio.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/syslogio.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: syslogio.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: syslogio.c,v 1.30 2013-11-22 20:51:43 ca Exp $")
#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
Modified: stable/0.8/contrib/sendmail/libsm/t-cf.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/t-cf.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/t-cf.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: t-cf.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: t-cf.c,v 1.8 2013-11-22 20:51:43 ca Exp $")
#include <errno.h>
#include <stdio.h>
Modified: stable/0.8/contrib/sendmail/libsm/t-event.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/t-event.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/t-event.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001-2002, 2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001-2002, 2004 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: t-event.c,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $")
+SM_RCSID("@(#)$Id: t-event.c,v 1.14 2013-11-22 20:51:43 ca Exp $")
#include <stdio.h>
Modified: stable/0.8/contrib/sendmail/libsm/t-exc.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/t-exc.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/t-exc.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: t-exc.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: t-exc.c,v 1.21 2013-11-22 20:51:43 ca Exp $")
#include <string.h>
#include <sm/heap.h>
Modified: stable/0.8/contrib/sendmail/libsm/t-fget.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/t-fget.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/t-fget.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2013 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: t-fget.c,v 1.1.1.1 2013-08-14 22:35:47 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: t-fget.c,v 1.2 2013-11-22 20:51:43 ca Exp $")
#include <sm/io.h>
#include <sm/string.h>
Modified: stable/0.8/contrib/sendmail/libsm/t-float.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/t-float.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/t-float.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: t-float.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: t-float.c,v 1.19 2013-11-22 20:51:43 ca Exp $")
#include <sm/limits.h>
#include <sm/io.h>
Modified: stable/0.8/contrib/sendmail/libsm/t-fopen.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/t-fopen.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/t-fopen.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2002 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: t-fopen.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: t-fopen.c,v 1.10 2013-11-22 20:51:43 ca Exp $")
#include <fcntl.h>
#include <sm/io.h>
Modified: stable/0.8/contrib/sendmail/libsm/t-heap.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/t-heap.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/t-heap.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: t-heap.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: t-heap.c,v 1.11 2013-11-22 20:51:43 ca Exp $")
#include <sm/debug.h>
#include <sm/heap.h>
Copied: stable/0.8/contrib/sendmail/libsm/t-inet6_ntop.c (from rev 9097, trunk/contrib/sendmail/libsm/t-inet6_ntop.c)
===================================================================
--- stable/0.8/contrib/sendmail/libsm/t-inet6_ntop.c (rev 0)
+++ stable/0.8/contrib/sendmail/libsm/t-inet6_ntop.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2013 Proofpoint, Inc. and its suppliers.
+ * All rights reserved.
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the sendmail distribution.
+ */
+
+#include <sm/gen.h>
+SM_IDSTR(id, "@(#)$Id: t-inet6_ntop.c,v 1.2 2013-11-22 20:51:43 ca Exp $")
+
+#include <sm/conf.h>
+#if NETINET6
+#include <sm/io.h>
+#include <sm/test.h>
+#include <sm/string.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+static char *ipv6f[] = {
+ "1234:5678:9abc:def0:fedc:dead:f00f:101",
+ "1080:0:0:0:8:800:200c:417a",
+ "ff01:0:0:0:0:0:0:43",
+ "0:0:0:0:0:0:0:1",
+ "1:0:0:0:0:0:0:1",
+ "0:1:0:0:0:0:0:1",
+ "0:0:1:0:0:0:0:1",
+ "0:0:0:1:0:0:0:1",
+ "0:0:0:0:1:0:0:1",
+ "0:0:0:0:0:1:0:1",
+ "0:0:0:0:0:0:1:1",
+ "1:a:b:c:d:e:f:9",
+ "0:0:0:0:0:0:0:0",
+ NULL
+};
+
+static void
+test()
+{
+ int i, r;
+ struct sockaddr_in6 addr;
+ char *ip, *ipf, ipv6str[INET6_ADDRSTRLEN];
+
+ for (i = 0; (ip = ipv6f[i]) != NULL; i++) {
+ r = inet_pton(AF_INET6, ip, &addr.sin6_addr);
+ SM_TEST(r == 1);
+ ipf = sm_inet6_ntop(&addr.sin6_addr, ipv6str, sizeof(ipv6str));
+ SM_TEST(ipf != NULL);
+ SM_TEST(strcmp(ipf, ip) == 0);
+ }
+}
+
+int
+main(argc, argv)
+ int argc;
+ char **argv;
+{
+ sm_test_begin(argc, argv, "test inet6_ntop");
+ test();
+ return sm_test_end();
+}
+#else /* NETINET6 */
+
+int
+main(argc, argv)
+ int argc;
+ char **argv;
+{
+ return 0;
+}
+#endif /* NETINET6 */
Modified: stable/0.8/contrib/sendmail/libsm/t-match.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/t-match.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/t-match.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: t-match.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: t-match.c,v 1.10 2013-11-22 20:51:43 ca Exp $")
#include <sm/string.h>
#include <sm/io.h>
Modified: stable/0.8/contrib/sendmail/libsm/t-memstat.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/t-memstat.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/t-memstat.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005-2007 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2005-2007 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: t-memstat.c,v 1.1.1.2 2007-11-23 22:10:30 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: t-memstat.c,v 1.11 2013-11-22 20:51:43 ca Exp $")
#include <sm/misc.h>
@@ -63,6 +63,12 @@
case 'r':
resource = strdup(optarg);
+ if (resource == NULL)
+ {
+ fprintf(stderr, "strdup(%s) failed\n",
+ optarg);
+ exit(1);
+ }
break;
case 's':
Modified: stable/0.8/contrib/sendmail/libsm/t-path.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/t-path.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/t-path.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: t-path.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: t-path.c,v 1.9 2013-11-22 20:51:43 ca Exp $")
#include <string.h>
#include <sm/path.h>
Modified: stable/0.8/contrib/sendmail/libsm/t-qic.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/t-qic.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/t-qic.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: t-qic.c,v 1.1.1.1 2007-11-23 22:10:30 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: t-qic.c,v 1.10 2013-11-22 20:51:43 ca Exp $")
#include <stdio.h>
#include <sm/sendmail.h>
Modified: stable/0.8/contrib/sendmail/libsm/t-rpool.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/t-rpool.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/t-rpool.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: t-rpool.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: t-rpool.c,v 1.19 2013-11-22 20:51:43 ca Exp $")
#include <sm/debug.h>
#include <sm/heap.h>
Modified: stable/0.8/contrib/sendmail/libsm/t-scanf.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/t-scanf.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/t-scanf.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: t-scanf.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: t-scanf.c,v 1.6 2013-11-22 20:51:43 ca Exp $")
#include <sm/limits.h>
#include <sm/io.h>
Modified: stable/0.8/contrib/sendmail/libsm/t-sem.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/t-sem.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/t-sem.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001, 2005-2008 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2005-2008 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: t-sem.c,v 1.1.1.5 2010-01-10 20:14:36 laffer1 Exp $")
+SM_RCSID("@(#)$Id: t-sem.c,v 1.18 2013-11-22 20:51:43 ca Exp $")
#include <stdio.h>
Modified: stable/0.8/contrib/sendmail/libsm/t-shm.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/t-shm.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/t-shm.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2002, 2004, 2005 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2002, 2004, 2005 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: t-shm.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: t-shm.c,v 1.23 2013-11-22 20:51:43 ca Exp $")
#include <stdio.h>
Modified: stable/0.8/contrib/sendmail/libsm/t-smstdio.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/t-smstdio.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/t-smstdio.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: t-smstdio.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: t-smstdio.c,v 1.12 2013-11-22 20:51:43 ca Exp $")
#include <sm/io.h>
#include <sm/string.h>
Modified: stable/0.8/contrib/sendmail/libsm/t-string.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/t-string.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/t-string.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: t-string.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: t-string.c,v 1.12 2013-11-22 20:51:43 ca Exp $")
#include <sm/exc.h>
#include <sm/io.h>
Modified: stable/0.8/contrib/sendmail/libsm/t-strio.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/t-strio.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/t-strio.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: t-strio.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: t-strio.c,v 1.12 2013-11-22 20:51:44 ca Exp $")
#include <sm/string.h>
#include <sm/io.h>
#include <sm/test.h>
Modified: stable/0.8/contrib/sendmail/libsm/t-strl.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/t-strl.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/t-strl.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: t-strl.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: t-strl.c,v 1.16 2013-11-22 20:51:44 ca Exp $")
#include <stdlib.h>
#include <stdio.h>
Modified: stable/0.8/contrib/sendmail/libsm/t-strrevcmp.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/t-strrevcmp.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/t-strrevcmp.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: t-strrevcmp.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: t-strrevcmp.c,v 1.4 2013-11-22 20:51:44 ca Exp $")
#include <sm/exc.h>
#include <sm/io.h>
Modified: stable/0.8/contrib/sendmail/libsm/t-types.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/t-types.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/t-types.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2002 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: t-types.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: t-types.c,v 1.19 2013-11-22 20:51:44 ca Exp $")
#include <sm/limits.h>
#include <sm/io.h>
Modified: stable/0.8/contrib/sendmail/libsm/test.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/test.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/test.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2002 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(Id, "@(#)$Id: test.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_IDSTR(Id, "@(#)$Id: test.c,v 1.17 2013-11-22 20:51:44 ca Exp $")
/*
** Abstractions for writing libsm test programs.
Modified: stable/0.8/contrib/sendmail/libsm/ungetc.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/ungetc.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/ungetc.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001, 2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2004 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: ungetc.c,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: ungetc.c,v 1.31 2013-11-22 20:51:44 ca Exp $")
#include <stdlib.h>
#include <string.h>
Modified: stable/0.8/contrib/sendmail/libsm/util.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/util.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/util.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: util.c,v 1.1.1.1 2007-11-23 22:10:30 laffer1 Exp $")
+SM_RCSID("@(#)$Id: util.c,v 1.10 2013-11-22 20:51:44 ca Exp $")
#include <sm/setjmp.h>
#include <sm/conf.h>
#include <sm/assert.h>
Modified: stable/0.8/contrib/sendmail/libsm/vasprintf.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/vasprintf.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/vasprintf.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -24,7 +24,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: vasprintf.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: vasprintf.c,v 1.28 2013-11-22 20:51:44 ca Exp $")
#include <stdlib.h>
#include <errno.h>
#include <sm/io.h>
Modified: stable/0.8/contrib/sendmail/libsm/vfprintf.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/vfprintf.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/vfprintf.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001, 2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2004 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: vfprintf.c,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: vfprintf.c,v 1.55 2013-11-22 20:51:44 ca Exp $")
/*
** Overall:
@@ -156,7 +156,7 @@
#define FPT 0x100 /* Floating point number */
/*
-** SM_IO_VPRINTF -- performs actual formating for o/p
+** SM_IO_VFPRINTF -- performs actual formating for o/p
**
** Parameters:
** fp -- file pointer for o/p
Modified: stable/0.8/contrib/sendmail/libsm/vfscanf.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/vfscanf.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/vfscanf.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001, 2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2004 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_IDSTR(id, "@(#)$Id: vfscanf.c,v 1.1.1.4 2007-11-23 22:10:30 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: vfscanf.c,v 1.55 2013-11-22 20:51:44 ca Exp $")
#include <ctype.h>
#include <stdlib.h>
Modified: stable/0.8/contrib/sendmail/libsm/vprintf.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/vprintf.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/vprintf.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: vprintf.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: vprintf.c,v 1.15 2013-11-22 20:51:44 ca Exp $")
#include <sm/io.h>
#include "local.h"
Modified: stable/0.8/contrib/sendmail/libsm/vsnprintf.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/vsnprintf.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/vsnprintf.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: vsnprintf.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: vsnprintf.c,v 1.24 2013-11-22 20:51:44 ca Exp $")
#include <limits.h>
#include <sm/io.h>
#include "local.h"
Modified: stable/0.8/contrib/sendmail/libsm/wbuf.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/wbuf.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/wbuf.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: wbuf.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: wbuf.c,v 1.22 2013-11-22 20:51:44 ca Exp $")
#include <errno.h>
#include <sm/io.h>
#include "local.h"
Modified: stable/0.8/contrib/sendmail/libsm/wsetup.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/wsetup.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/wsetup.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2002 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,7 +13,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: wsetup.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: wsetup.c,v 1.21 2013-11-22 20:51:44 ca Exp $")
#include <stdlib.h>
#include <errno.h>
#include <sm/io.h>
Modified: stable/0.8/contrib/sendmail/libsm/xtrap.c
===================================================================
--- stable/0.8/contrib/sendmail/libsm/xtrap.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsm/xtrap.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: xtrap.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: xtrap.c,v 1.6 2013-11-22 20:51:44 ca Exp $")
#include <sm/xtrap.h>
Modified: stable/0.8/contrib/sendmail/libsmdb/Makefile
===================================================================
--- stable/0.8/contrib/sendmail/libsmdb/Makefile 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsmdb/Makefile 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+# $Id: Makefile,v 8.2 1999-09-23 22:36:29 ca Exp $
SHELL= /bin/sh
BUILD= ./Build
Modified: stable/0.8/contrib/sendmail/libsmdb/Makefile.m4
===================================================================
--- stable/0.8/contrib/sendmail/libsmdb/Makefile.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsmdb/Makefile.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-dnl $Id: Makefile.m4,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+dnl $Id: Makefile.m4,v 8.15 2006-06-28 21:08:01 ca Exp $
include(confBUILDTOOLSDIR`/M4/switch.m4')
define(`confREQUIRE_SM_OS_H', `true')
Modified: stable/0.8/contrib/sendmail/libsmdb/smdb.c
===================================================================
--- stable/0.8/contrib/sendmail/libsmdb/smdb.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsmdb/smdb.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
-** Copyright (c) 1999-2002 Sendmail, Inc. and its suppliers.
+** Copyright (c) 1999-2002 Proofpoint, Inc. and its suppliers.
** All rights reserved.
**
** By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: smdb.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: smdb.c,v 8.59 2013-11-22 20:51:49 ca Exp $")
#include <fcntl.h>
#include <stdlib.h>
@@ -198,12 +198,16 @@
SMDB_USER_INFO *user_info;
SMDB_DBPARAMS *params;
{
+#if defined(NEWDB) && defined(NDBM)
bool type_was_default = false;
+#endif
if (type == SMDB_TYPE_DEFAULT)
{
+#ifdef NEWDB
+# ifdef NDBM
type_was_default = true;
-#ifdef NEWDB
+# endif
type = SMDB_TYPE_HASH;
#else /* NEWDB */
# ifdef NDBM
Modified: stable/0.8/contrib/sendmail/libsmdb/smdb1.c
===================================================================
--- stable/0.8/contrib/sendmail/libsmdb/smdb1.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsmdb/smdb1.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
-** Copyright (c) 1999-2002, 2004, 2009 Sendmail, Inc. and its suppliers.
+** Copyright (c) 1999-2002, 2004, 2009 Proofpoint, Inc. and its suppliers.
** All rights reserved.
**
** By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: smdb1.c,v 1.1.1.3 2010-01-10 20:14:37 laffer1 Exp $")
+SM_RCSID("@(#)$Id: smdb1.c,v 8.63 2013-11-22 20:51:49 ca Exp $")
#include <unistd.h>
#include <stdlib.h>
Modified: stable/0.8/contrib/sendmail/libsmdb/smdb2.c
===================================================================
--- stable/0.8/contrib/sendmail/libsmdb/smdb2.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsmdb/smdb2.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
-** Copyright (c) 1999-2003, 2009 Sendmail, Inc. and its suppliers.
+** Copyright (c) 1999-2003, 2009 Proofpoint, Inc. and its suppliers.
** All rights reserved.
**
** By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: smdb2.c,v 1.1.1.3 2010-01-10 20:14:37 laffer1 Exp $")
+SM_RCSID("@(#)$Id: smdb2.c,v 8.83 2013-11-22 20:51:49 ca Exp $")
#include <fcntl.h>
#include <stdlib.h>
@@ -625,6 +625,8 @@
{
smdb_unlock_file(lock_fd);
smdb_free_database(smdb_db); /* ok to be NULL */
+ if (db2 != NULL)
+ free(db2);
return SMDBE_MALLOC;
}
Modified: stable/0.8/contrib/sendmail/libsmdb/smndbm.c
===================================================================
--- stable/0.8/contrib/sendmail/libsmdb/smndbm.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsmdb/smndbm.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
-** Copyright (c) 1999-2002 Sendmail, Inc. and its suppliers.
+** Copyright (c) 1999-2002 Proofpoint, Inc. and its suppliers.
** All rights reserved.
**
** By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: smndbm.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: smndbm.c,v 8.55 2013-11-22 20:51:49 ca Exp $")
#include <fcntl.h>
#include <stdlib.h>
@@ -438,6 +438,8 @@
db->smndbm_cursor_in_use = true;
dbm_cursor = (SMDB_DBM_CURSOR *) malloc(sizeof(SMDB_DBM_CURSOR));
+ if (dbm_cursor == NULL)
+ return SMDBE_MALLOC;
dbm_cursor->smndbmc_db = db;
dbm_cursor->smndbmc_current_key.dptr = NULL;
dbm_cursor->smndbmc_current_key.dsize = 0;
@@ -444,7 +446,10 @@
cur = (SMDB_CURSOR*) malloc(sizeof(SMDB_CURSOR));
if (cur == NULL)
+ {
+ free(dbm_cursor);
return SMDBE_MALLOC;
+ }
cur->smdbc_impl = dbm_cursor;
cur->smdbc_close = smdbm_cursor_close;
Modified: stable/0.8/contrib/sendmail/libsmutil/Makefile
===================================================================
--- stable/0.8/contrib/sendmail/libsmutil/Makefile 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsmutil/Makefile 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $
+# $Id: Makefile,v 8.2 1999-09-23 22:36:32 ca Exp $
SHELL= /bin/sh
BUILD= ./Build
Modified: stable/0.8/contrib/sendmail/libsmutil/Makefile.m4
===================================================================
--- stable/0.8/contrib/sendmail/libsmutil/Makefile.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsmutil/Makefile.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-dnl $Id: Makefile.m4,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+dnl $Id: Makefile.m4,v 8.18 2006-06-28 21:02:39 ca Exp $
include(confBUILDTOOLSDIR`/M4/switch.m4')
define(`confREQUIRE_SM_OS_H', `true')
Modified: stable/0.8/contrib/sendmail/libsmutil/cf.c
===================================================================
--- stable/0.8/contrib/sendmail/libsmutil/cf.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsmutil/cf.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2002 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
*/
#include <sendmail.h>
-SM_RCSID("@(#)$Id: cf.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: cf.c,v 8.20 2013-11-22 20:51:50 ca Exp $")
#include <sendmail/pathnames.h>
/*
Modified: stable/0.8/contrib/sendmail/libsmutil/debug.c
===================================================================
--- stable/0.8/contrib/sendmail/libsmutil/debug.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsmutil/debug.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -10,6 +10,6 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: debug.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: debug.c,v 8.10 2013-11-22 20:51:50 ca Exp $")
unsigned char tTdvect[100]; /* trace vector */
Modified: stable/0.8/contrib/sendmail/libsmutil/err.c
===================================================================
--- stable/0.8/contrib/sendmail/libsmutil/err.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsmutil/err.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: err.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: err.c,v 8.6 2013-11-22 20:51:50 ca Exp $")
#include <ctype.h>
Modified: stable/0.8/contrib/sendmail/libsmutil/lockfile.c
===================================================================
--- stable/0.8/contrib/sendmail/libsmutil/lockfile.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsmutil/lockfile.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: lockfile.c,v 1.1.1.2 2006-02-25 02:33:56 laffer1 Exp $")
+SM_RCSID("@(#)$Id: lockfile.c,v 8.22 2013-11-22 20:51:50 ca Exp $")
/*
Modified: stable/0.8/contrib/sendmail/libsmutil/safefile.c
===================================================================
--- stable/0.8/contrib/sendmail/libsmutil/safefile.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsmutil/safefile.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2004 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -15,7 +15,7 @@
#include <sm/io.h>
#include <sm/errstring.h>
-SM_RCSID("@(#)$Id: safefile.c,v 1.1.1.3 2010-01-10 20:14:36 laffer1 Exp $")
+SM_RCSID("@(#)$Id: safefile.c,v 8.130 2013-11-22 20:51:50 ca Exp $")
/*
Modified: stable/0.8/contrib/sendmail/libsmutil/snprintf.c
===================================================================
--- stable/0.8/contrib/sendmail/libsmutil/snprintf.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/libsmutil/snprintf.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: snprintf.c,v 1.1.1.2 2006-02-25 02:33:57 laffer1 Exp $")
+SM_RCSID("@(#)$Id: snprintf.c,v 8.45 2013-11-22 20:51:50 ca Exp $")
/*
** SHORTENSTRING -- return short version of a string
Modified: stable/0.8/contrib/sendmail/mail.local/Makefile
===================================================================
--- stable/0.8/contrib/sendmail/mail.local/Makefile 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/mail.local/Makefile 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.2 2006-02-25 02:33:57 laffer1 Exp $
+# $Id: Makefile,v 8.5 1999-10-05 16:39:32 ca Exp $
SHELL= /bin/sh
BUILD= ./Build
Modified: stable/0.8/contrib/sendmail/mail.local/Makefile.m4
===================================================================
--- stable/0.8/contrib/sendmail/mail.local/Makefile.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/mail.local/Makefile.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-dnl $Id: Makefile.m4,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+dnl $Id: Makefile.m4,v 8.52 2006-06-28 21:08:02 ca Exp $
include(confBUILDTOOLSDIR`/M4/switch.m4')
define(`confREQUIRE_LIBSM', `true')
Modified: stable/0.8/contrib/sendmail/mail.local/README
===================================================================
--- stable/0.8/contrib/sendmail/mail.local/README 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/mail.local/README 2016-10-01 17:46:48 UTC (rev 9102)
@@ -61,4 +61,4 @@
+, and _. The hash type is "m", so use "-H m3" to get a three level MD5
based hash.
-$Revision: 1.1.1.2 $, Last updated $Date: 2006-02-25 02:33:57 $
+$Revision: 8.11 $, Last updated $Date: 2003-10-20 20:19:13 $
Copied: stable/0.8/contrib/sendmail/mail.local/mail.local.0 (from rev 9097, trunk/contrib/sendmail/mail.local/mail.local.0)
===================================================================
--- stable/0.8/contrib/sendmail/mail.local/mail.local.0 (rev 0)
+++ stable/0.8/contrib/sendmail/mail.local/mail.local.0 2016-10-01 17:46:48 UTC (rev 9102)
@@ -0,0 +1,97 @@
+MAIL.LOCAL(8) MAIL.LOCAL(8)
+
+
+
+NNAAMMEE
+ mail.local - store mail in a mailbox
+
+SSYYNNOOPPSSIISS
+ mmaaiill..llooccaall [--77] [--bb] [--dd] [--DD _m_b_d_b] [--ll] [--ff _f_r_o_m|--rr _f_r_o_m] [--hh _f_i_l_e_n_a_m_e
+ ] _u_s_e_r _._._.
+
+DDEESSCCRRIIPPTTIIOONN
+ MMaaiill..llooccaall reads the standard input up to an end-of-file and appends it
+ to each _u_s_e_r_'_s mmaaiill file. The _u_s_e_r must be a valid user name.
+
+ The options are as follows:
+
+ --77 Do not advertise 8BITMIME support in LMTP mode.
+
+ --bb Return a permanent error instead of a temporary error if a
+ mailbox exceeds quota.
+
+ --dd Specify this is a delivery (for backward compatibility).
+ This option has no effect.
+
+ --DD _m_b_d_b Specify the name of the mailbox database which is used to
+ look up local recipient names. This option defaults to "pw",
+ which means use getpwnam().
+
+ --ff _f_r_o_m Specify the sender's name.
+
+ --ll Turn on LMTP mode.
+
+ --rr _f_r_o_m Specify the sender's name (for backward compatibility). Same
+ as -f.
+
+ --hh _f_i_l_e_n_a_m_e
+ Store incoming mail in _f_i_l_e_n_a_m_e in the user's home directory
+ instead of a system mail spool directory.
+
+ The next options are only available if mmaaiill..llooccaall has been compiled
+ with -DHASHSPOOL.
+
+ --HH _h_a_s_h_t_y_p_e_h_a_s_h_d_e_p_t_h
+ Select hashed mail directories. Valid hash types are uu for user
+ name and mm for MD5 (requires compilation with -DHASHSPOOLMD5).
+ Example: --HH _u_2 selects user name hashing with a hash depth of 2.
+ Note: there must be no space between the hash type and the
+ depth.
+
+ --pp _p_a_t_h
+ Specify an alternate mail spool path.
+
+ --nn Specify that the domain part of recipient addresses in LMTP mode
+ should not be stripped.
+
+ Individual mail messages in the mailbox are delimited by an empty line
+ followed by a line beginning with the string ``From ''. A line con-
+ taining the string ``From '', the sender's name and a time stamp is
+ prepended to each delivered mail message. A blank line is appended to
+ each message. A greater-than character (``>'') is prepended to any
+ line in the message which could be mistaken for a ``From '' delimiter
+ line (that is, a line beginning with the five characters ``From '' fol-
+ lowing a blank line).
+
+ The mail files are exclusively locked with flock(2) while mail is
+ appended, and a uusseerr..lloocckk file also is created while the mailbox is
+ locked for compatibility with older MUAs.
+
+ If the ``biff'' service is returned by getservbyname(3), the biff
+ server is notified of delivered mail.
+
+ The mmaaiill..llooccaall utility exits 0 on success, and >0 if an error occurs.
+
+EENNVVIIRROONNMMEENNTT
+ TZ Used to set the appropriate time zone on the timestamp.
+
+FFIILLEESS
+ /tmp/local.XXXXXX temporary files
+ /var/mail/user user's default mailbox directory
+ /var/mail/user.lock lock file for a user's default mailbox
+
+SSEEEE AALLSSOO
+ mail(1), xsend(1), flock(2), getservbyname(3), comsat(8), sendmail(8)
+
+WWAARRNNIINNGG
+ mmaaiill..llooccaall escapes only "^From " lines that follow an empty line. If
+ all lines starting with "From " should be escaped, use the 'E' flag for
+ the local mailer in the sendmail.cf file.
+
+HHIISSTTOORRYY
+ A superset of mmaaiill..llooccaall (handling mailbox reading as well as mail
+ delivery) appeared in Version 7 AT&T UNIX as the program mmaaiill.
+
+
+
+ $Date: 2013-11-22 20:51:51 $ MAIL.LOCAL(8)
Modified: stable/0.8/contrib/sendmail/mail.local/mail.local.8
===================================================================
--- stable/0.8/contrib/sendmail/mail.local/mail.local.8 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/mail.local/mail.local.8 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1998-2001, 2003 Sendmail, Inc. and its suppliers.
+.\" Copyright (c) 1998-2001, 2003 Proofpoint, Inc. and its suppliers.
.\" All rights reserved.
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -8,9 +8,9 @@
.\" the sendmail distribution.
.\"
.\"
-.\" $Id: mail.local.8,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $
+.\" $Id: mail.local.8,v 8.26 2013-11-22 20:51:51 ca Exp $
.\"
-.TH MAIL.LOCAL 8 "$Date: 2006-08-04 02:03:05 $"
+.TH MAIL.LOCAL 8 "$Date: 2013-11-22 20:51:51 $"
.SH NAME
mail.local
\- store mail in a mailbox
Modified: stable/0.8/contrib/sendmail/mail.local/mail.local.c
===================================================================
--- stable/0.8/contrib/sendmail/mail.local/mail.local.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/mail.local/mail.local.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2004 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -13,12 +13,12 @@
#include <sm/gen.h>
SM_IDSTR(copyright,
-"@(#) Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers.\n\
+"@(#) Copyright (c) 1998-2004 Proofpoint, Inc. and its suppliers.\n\
All rights reserved.\n\
Copyright (c) 1990, 1993, 1994\n\
The Regents of the University of California. All rights reserved.\n")
-SM_IDSTR(id, "@(#)$Id: mail.local.c,v 1.1.1.5 2008-05-28 21:04:00 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: mail.local.c,v 8.257 2013-11-22 20:51:51 ca Exp $")
#include <stdlib.h>
#include <sm/errstring.h>
Modified: stable/0.8/contrib/sendmail/mailstats/Makefile
===================================================================
--- stable/0.8/contrib/sendmail/mailstats/Makefile 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/mailstats/Makefile 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.2 2006-02-25 02:33:57 laffer1 Exp $
+# $Id: Makefile,v 8.5 1999-09-23 22:36:36 ca Exp $
SHELL= /bin/sh
BUILD= ./Build
Modified: stable/0.8/contrib/sendmail/mailstats/Makefile.m4
===================================================================
--- stable/0.8/contrib/sendmail/mailstats/Makefile.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/mailstats/Makefile.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-dnl $Id: Makefile.m4,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+dnl $Id: Makefile.m4,v 8.36 2006-06-28 21:08:02 ca Exp $
include(confBUILDTOOLSDIR`/M4/switch.m4')
define(`confREQUIRE_LIBSM', `true')
Copied: stable/0.8/contrib/sendmail/mailstats/mailstats.0 (from rev 9097, trunk/contrib/sendmail/mailstats/mailstats.0)
===================================================================
--- stable/0.8/contrib/sendmail/mailstats/mailstats.0 (rev 0)
+++ stable/0.8/contrib/sendmail/mailstats/mailstats.0 2016-10-01 17:46:48 UTC (rev 9102)
@@ -0,0 +1,64 @@
+MAILSTATS(8) MAILSTATS(8)
+
+
+
+NNAAMMEE
+ mailstats - display mail statistics
+
+SSYYNNOOPPSSIISS
+ mmaaiillssttaattss [--cc] [--oo] [--pp] [--PP] [--CC _c_f_f_i_l_e] [--ff _s_t_f_i_l_e]
+
+DDEESSCCRRIIPPTTIIOONN
+ The mmaaiillssttaattss utility displays the current mail statistics.
+
+ First, the time at which statistics started being kept is displayed, in
+ the format specified by ctime(3). Then, the statistics for each mailer
+ are displayed on a single line, each with the following white space
+ separated fields:
+
+ MM The mailer number.
+ mmssggssffrr Number of messages from the mailer.
+ bbyytteess__ffrroomm Kbytes from the mailer.
+ mmssggssttoo Number of messages to the mailer.
+ bbyytteess__ttoo Kbytes to the mailer.
+ mmssggssrreejj Number of messages rejected.
+ mmssggssddiiss Number of messages discarded.
+ mmssggssqquurr Number of messages quarantined.
+ MMaaiilleerr The name of the mailer.
+
+ After this display, a line totaling the values for all of the mailers
+ is displayed (preceded with a ``T''), separated from the previous
+ information by a line containing only equals (``='') characters.
+ Another line preceded with a ``C'' lists the number of TCP connections.
+
+ The options are as follows:
+
+ --CC Read the specified file instead of the default sseennddmmaaiill configu-
+ ration file.
+
+ --cc Try to use submit.cf instead of the default sseennddmmaaiill configura-
+ tion file.
+
+ --ff Read the specified statistics file instead of the statistics
+ file specified in the sseennddmmaaiill configuration file.
+
+ --PP Output information in program-readable mode without clearing
+ statistics.
+
+ --pp Output information in program-readable mode and clear statis-
+ tics.
+
+ --oo Don't display the name of the mailer in the output.
+
+ The mmaaiillssttaattss utility exits 0 on success, and >0 if an error occurs.
+
+FFIILLEESS
+ /etc/mail/sendmail.cf The default sseennddmmaaiill configuration file.
+ /etc/mail/statistics The default sseennddmmaaiill statistics file.
+
+SSEEEE AALLSSOO
+ mailq(1), sendmail(8)
+
+
+
+ $Date: 2013-11-22 20:51:51 $ MAILSTATS(8)
Modified: stable/0.8/contrib/sendmail/mailstats/mailstats.8
===================================================================
--- stable/0.8/contrib/sendmail/mailstats/mailstats.8 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/mailstats/mailstats.8 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers.
+.\" Copyright (c) 1998-2002 Proofpoint, Inc. and its suppliers.
.\" All rights reserved.
.\"
.\" By using this file, you agree to the terms and conditions set
@@ -6,9 +6,9 @@
.\" the sendmail distribution.
.\"
.\"
-.\" $Id: mailstats.8,v 1.1.1.2 2006-02-25 02:33:57 laffer1 Exp $
+.\" $Id: mailstats.8,v 8.32 2013-11-22 20:51:51 ca Exp $
.\"
-.TH MAILSTATS 8 "$Date: 2006-02-25 02:33:57 $"
+.TH MAILSTATS 8 "$Date: 2013-11-22 20:51:51 $"
.SH NAME
mailstats
\- display mail statistics
Modified: stable/0.8/contrib/sendmail/mailstats/mailstats.c
===================================================================
--- stable/0.8/contrib/sendmail/mailstats/mailstats.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/mailstats/mailstats.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2002, 2013 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2002, 2013 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -15,12 +15,12 @@
#include <sm/gen.h>
SM_IDSTR(copyright,
-"@(#) Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers.\n\
+"@(#) Copyright (c) 1998-2002 Proofpoint, Inc. and its suppliers.\n\
All rights reserved.\n\
Copyright (c) 1988, 1993\n\
The Regents of the University of California. All rights reserved.\n")
-SM_IDSTR(id, "@(#)$Id: mailstats.c,v 1.1.1.3 2013-08-14 22:35:47 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: mailstats.c,v 8.103 2013-11-22 20:51:51 ca Exp $")
#include <unistd.h>
#include <stddef.h>
Modified: stable/0.8/contrib/sendmail/makemap/Makefile
===================================================================
--- stable/0.8/contrib/sendmail/makemap/Makefile 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/makemap/Makefile 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.2 2006-02-25 02:33:57 laffer1 Exp $
+# $Id: Makefile,v 8.7 1999-09-23 22:36:37 ca Exp $
SHELL= /bin/sh
BUILD= ./Build
Modified: stable/0.8/contrib/sendmail/makemap/Makefile.m4
===================================================================
--- stable/0.8/contrib/sendmail/makemap/Makefile.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/makemap/Makefile.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-dnl $Id: Makefile.m4,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+dnl $Id: Makefile.m4,v 8.44 2006-06-28 21:08:03 ca Exp $
include(confBUILDTOOLSDIR`/M4/switch.m4')
define(`confREQUIRE_LIBSM', `true')
Copied: stable/0.8/contrib/sendmail/makemap/makemap.0 (from rev 9097, trunk/contrib/sendmail/makemap/makemap.0)
===================================================================
--- stable/0.8/contrib/sendmail/makemap/makemap.0 (rev 0)
+++ stable/0.8/contrib/sendmail/makemap/makemap.0 2016-10-01 17:46:48 UTC (rev 9102)
@@ -0,0 +1,90 @@
+MAKEMAP(8) MAKEMAP(8)
+
+
+
+NNAAMMEE
+ makemap - create database maps for sendmail
+
+SSYYNNOOPPSSIISS
+ mmaakkeemmaapp [--CC _f_i_l_e] [--NN] [--cc _c_a_c_h_e_s_i_z_e] [--dd] [--DD _c_o_m_m_e_n_t_c_h_a_r] [--ee] [--ff]
+ [--ll] [--oo] [--rr] [--ss] [--tt _d_e_l_i_m] [--uu] [--vv] _m_a_p_t_y_p_e _m_a_p_n_a_m
+
+DDEESSCCRRIIPPTTIIOONN
+ MMaakkeemmaapp creates the database maps used by the keyed map lookups in
+ sendmail(8). It reads input from the standard input and outputs them
+ to the indicated _m_a_p_n_a_m_e_.
+
+ Depending on how it is compiled, mmaakkeemmaapp handles up to three different
+ database formats, selected using the _m_a_p_t_y_p_e parameter. They may be
+
+ dbm DBM format maps. This requires the ndbm(3) library.
+
+ btree B-Tree format maps. This requires the new Berkeley DB library.
+
+ hash Hash format maps. This also requires the Berkeley DB library.
+
+ In all cases, mmaakkeemmaapp reads lines from the standard input consisting of
+ two words separated by white space. The first is the database key, the
+ second is the value. The value may contain ``%_n'' strings to indicate
+ parameter substitution. Literal percents should be doubled (``%%'').
+ Blank lines and lines beginning with ``#'' are ignored.
+
+ Notice: do nnoott use mmaakkeemmaapp to create the aliases data base, but
+ nneewwaalliiaasseess which puts a special token into the data base that is
+ required by sseennddmmaaiill..
+
+ If the _T_r_u_s_t_e_d_U_s_e_r option is set in the sendmail configuration file and
+ mmaakkeemmaapp is invoked as root, the generated files will be owned by the
+ specified _T_r_u_s_t_e_d_U_s_e_r_.
+
+ FFllaaggss
+ --CC Use the specified sseennddmmaaiill configuration file for looking up the
+ TrustedUser option.
+
+ --NN Include the null byte that terminates strings in the map. This
+ must match the -N flag in the sendmail.cf ``K'' line.
+
+ --cc Use the specified hash and B-Tree cache size.
+
+ --DD Use to specify the character to use to indicate a comment (which
+ is ignored) instead of the default of '#'.
+
+ --dd Allow duplicate keys in the map. This is only allowed on B-Tree
+ format maps. If two identical keys are read, they will both be
+ inserted into the map.
+
+ --ee Allow empty value (right hand side).
+
+ --ff Normally all upper case letters in the key are folded to lower
+ case. This flag disables that behaviour. This is intended to
+ mesh with the -f flag in the KK line in sendmail.cf. The value
+ is never case folded.
+
+ --ll List supported map types.
+
+ --oo Append to an old file. This allows you to augment an existing
+ file.
+
+ --rr Allow replacement of existing keys. Normally mmaakkeemmaapp complains
+ if you repeat a key, and does not do the insert.
+
+ --ss Ignore safety checks on maps being created. This includes
+ checking for hard or symbolic links in world writable directo-
+ ries.
+
+ --tt Use the specified delimiter instead of white space (also for
+ dumping a map).
+
+ --uu dump (unmap) the content of the database to standard output.
+
+ --vv Verbosely print what it is doing.
+
+SSEEEE AALLSSOO
+ sendmail(8), newaliases(1)
+
+HHIISSTTOORRYY
+ The mmaakkeemmaapp command appeared in 4.4BSD.
+
+
+
+ $Date: 2013-11-22 20:51:52 $ MAKEMAP(8)
Modified: stable/0.8/contrib/sendmail/makemap/makemap.8
===================================================================
--- stable/0.8/contrib/sendmail/makemap/makemap.8 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/makemap/makemap.8 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers.
+.\" Copyright (c) 1998-2002 Proofpoint, Inc. and its suppliers.
.\" All rights reserved.
.\" Copyright (c) 1988, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -8,9 +8,9 @@
.\" the sendmail distribution.
.\"
.\"
-.\" $Id: makemap.8,v 1.1.1.3 2008-05-28 21:04:00 laffer1 Exp $
+.\" $Id: makemap.8,v 8.32 2013-11-22 20:51:52 ca Exp $
.\"
-.TH MAKEMAP 8 "$Date: 2008-05-28 21:04:00 $"
+.TH MAKEMAP 8 "$Date: 2013-11-22 20:51:52 $"
.SH NAME
makemap
\- create database maps for sendmail
Modified: stable/0.8/contrib/sendmail/makemap/makemap.c
===================================================================
--- stable/0.8/contrib/sendmail/makemap/makemap.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/makemap/makemap.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2002, 2004, 2008 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2002, 2004, 2008 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1992 Eric P. Allman. All rights reserved.
* Copyright (c) 1992, 1993
@@ -14,13 +14,13 @@
#include <sm/gen.h>
SM_IDSTR(copyright,
-"@(#) Copyright (c) 1998-2002, 2004 Sendmail, Inc. and its suppliers.\n\
+"@(#) Copyright (c) 1998-2002, 2004 Proofpoint, Inc. and its suppliers.\n\
All rights reserved.\n\
Copyright (c) 1992 Eric P. Allman. All rights reserved.\n\
Copyright (c) 1992, 1993\n\
The Regents of the University of California. All rights reserved.\n")
-SM_IDSTR(id, "@(#)$Id: makemap.c,v 1.1.1.6 2013-08-14 22:35:47 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.183 2013-11-22 20:51:52 ca Exp $")
#include <sys/types.h>
Modified: stable/0.8/contrib/sendmail/praliases/Makefile
===================================================================
--- stable/0.8/contrib/sendmail/praliases/Makefile 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/praliases/Makefile 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.2 2006-02-25 02:33:57 laffer1 Exp $
+# $Id: Makefile,v 8.5 1999-09-23 22:36:39 ca Exp $
SHELL= /bin/sh
BUILD= ./Build
Modified: stable/0.8/contrib/sendmail/praliases/Makefile.m4
===================================================================
--- stable/0.8/contrib/sendmail/praliases/Makefile.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/praliases/Makefile.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-dnl $Id: Makefile.m4,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+dnl $Id: Makefile.m4,v 8.36 2006-06-28 21:08:03 ca Exp $
include(confBUILDTOOLSDIR`/M4/switch.m4')
define(`confREQUIRE_LIBSM', `true')
Copied: stable/0.8/contrib/sendmail/praliases/praliases.0 (from rev 9097, trunk/contrib/sendmail/praliases/praliases.0)
===================================================================
--- stable/0.8/contrib/sendmail/praliases/praliases.0 (rev 0)
+++ stable/0.8/contrib/sendmail/praliases/praliases.0 2016-10-01 17:46:48 UTC (rev 9102)
@@ -0,0 +1,39 @@
+PRALIASES(8) PRALIASES(8)
+
+
+
+NNAAMMEE
+ praliases - display system mail aliases
+
+SSYYNNOOPPSSIISS
+ pprraalliiaasseess [--CC _f_i_l_e] [--ff _f_i_l_e] [_k_e_y _._._.]
+
+DDEESSCCRRIIPPTTIIOONN
+ The pprraalliiaasseess utility displays the current system aliases, one per
+ line, in no particular order. The special internal @:@ alias will be
+ displayed if present.
+
+ The options are as follows:
+
+ --CC _f_i_l_e
+ Read the specified sendmail configuration file instead of the
+ default sseennddmmaaiill configuration file.
+
+ --ff _f_i_l_e
+ Read the specified file instead of the configured sseennddmmaaiill sys-
+ tem aliases file(s).
+
+ If one or more keys are specified on the command line, only entries
+ which match those keys are displayed.
+
+ The pprraalliiaasseess utility exits 0 on success, and >0 if an error occurs.
+
+FFIILLEESS
+ /etc/mail/sendmail.cf The default sseennddmmaaiill configuration file.
+
+SSEEEE AALLSSOO
+ mailq(1), sendmail(8)
+
+
+
+ $Date: 2013-11-22 20:51:53 $ PRALIASES(8)
Modified: stable/0.8/contrib/sendmail/praliases/praliases.8
===================================================================
--- stable/0.8/contrib/sendmail/praliases/praliases.8 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/praliases/praliases.8 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1998-2000, 2008 Sendmail, Inc. and its suppliers.
+.\" Copyright (c) 1998-2000, 2008 Proofpoint, Inc. and its suppliers.
.\" All rights reserved.
.\"
.\" By using this file, you agree to the terms and conditions set
@@ -6,9 +6,9 @@
.\" the sendmail distribution.
.\"
.\"
-.\" $Id: praliases.8,v 1.1.1.3 2010-01-10 20:14:37 laffer1 Exp $
+.\" $Id: praliases.8,v 8.20 2013-11-22 20:51:53 ca Exp $
.\"
-.TH PRALIASES 8 "$Date: 2010-01-10 20:14:37 $"
+.TH PRALIASES 8 "$Date: 2013-11-22 20:51:53 $"
.SH NAME
praliases
\- display system mail aliases
Modified: stable/0.8/contrib/sendmail/praliases/praliases.c
===================================================================
--- stable/0.8/contrib/sendmail/praliases/praliases.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/praliases/praliases.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2001, 2008 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2001, 2008 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -14,13 +14,13 @@
#include <sm/gen.h>
SM_IDSTR(copyright,
-"@(#) Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.\n\
+"@(#) Copyright (c) 1998-2001 Proofpoint, Inc. and its suppliers.\n\
All rights reserved.\n\
Copyright (c) 1983 Eric P. Allman. All rights reserved.\n\
Copyright (c) 1988, 1993\n\
The Regents of the University of California. All rights reserved.\n")
-SM_IDSTR(id, "@(#)$Id: praliases.c,v 1.1.1.5 2013-08-14 22:35:47 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: praliases.c,v 8.98 2013-11-22 20:51:53 ca Exp $")
#include <sys/types.h>
#include <ctype.h>
Modified: stable/0.8/contrib/sendmail/rmail/Makefile
===================================================================
--- stable/0.8/contrib/sendmail/rmail/Makefile 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/rmail/Makefile 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.2 2006-02-25 02:33:57 laffer1 Exp $
+# $Id: Makefile,v 8.5 1999-10-05 16:39:19 ca Exp $
SHELL= /bin/sh
BUILD= ./Build
Modified: stable/0.8/contrib/sendmail/rmail/Makefile.m4
===================================================================
--- stable/0.8/contrib/sendmail/rmail/Makefile.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/rmail/Makefile.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-dnl $Id: Makefile.m4,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+dnl $Id: Makefile.m4,v 8.44 2006-06-28 21:08:04 ca Exp $
include(confBUILDTOOLSDIR`/M4/switch.m4')
define(`confREQUIRE_LIBSM', `true')
Copied: stable/0.8/contrib/sendmail/rmail/rmail.0 (from rev 9097, trunk/contrib/sendmail/rmail/rmail.0)
===================================================================
--- stable/0.8/contrib/sendmail/rmail/rmail.0 (rev 0)
+++ stable/0.8/contrib/sendmail/rmail/rmail.0 2016-10-01 17:46:48 UTC (rev 9102)
@@ -0,0 +1,36 @@
+RMAIL(8) RMAIL(8)
+
+
+
+NNAAMMEE
+ rmail - handle remote mail received via uucp
+
+SSYYNNOOPPSSIISS
+ rrmmaaiill [--DD _d_o_m_a_i_n] [--TT] _u_s_e_r _._._.
+
+DDEESSCCRRIIPPTTIIOONN
+ RRmmaaiill interprets incoming mail received via uucp(1), collapsing
+ ``From'' lines in the form generated by mail.local(8) into a single
+ line of the form ``return-path!sender'', and passing the processed mail
+ on to sendmail(8).
+
+ RRmmaaiill is explicitly designed for use with uucp and sendmail.
+
+ FFllaaggss
+ --DD Use the specified _d_o_m_a_i_n instead of the default domain of
+ ``UUCP''.
+
+ --TT Turn on debugging.
+
+SSEEEE AALLSSOO
+ uucp(1), mail.local(8), sendmail(8)
+
+HHIISSTTOORRYY
+ The rrmmaaiill program appeared in 4.2BSD.
+
+BBUUGGSS
+ RRmmaaiill should not reside in /bin.
+
+
+
+ $Date: 2013-11-22 20:51:53 $ RMAIL(8)
Modified: stable/0.8/contrib/sendmail/rmail/rmail.8
===================================================================
--- stable/0.8/contrib/sendmail/rmail/rmail.8 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/rmail/rmail.8 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
+.\" Copyright (c) 1998-2000 Proofpoint, Inc. and its suppliers.
.\" All rights reserved.
.\" Copyright (c) 1983, 1990
.\" The Regents of the University of California. All rights reserved.
@@ -8,9 +8,9 @@
.\" the sendmail distribution.
.\"
.\"
-.\" $Id: rmail.8,v 1.1.1.2 2006-02-25 02:33:57 laffer1 Exp $
+.\" $Id: rmail.8,v 8.5 2013-11-22 20:51:53 ca Exp $
.\"
-.TH RMAIL 8 "$Date: 2006-02-25 02:33:57 $"
+.TH RMAIL 8 "$Date: 2013-11-22 20:51:53 $"
.SH NAME
rmail
\- handle remote mail received via uucp
Modified: stable/0.8/contrib/sendmail/rmail/rmail.c
===================================================================
--- stable/0.8/contrib/sendmail/rmail/rmail.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/rmail/rmail.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -13,12 +13,12 @@
#include <sm/gen.h>
SM_IDSTR(copyright,
-"@(#) Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.\n\
+"@(#) Copyright (c) 1998-2001 Proofpoint, Inc. and its suppliers.\n\
All rights reserved.\n\
Copyright (c) 1988, 1993\n\
The Regents of the University of California. All rights reserved.\n")
-SM_IDSTR(id, "@(#)$Id: rmail.c,v 1.1.1.4 2013-08-14 22:35:47 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: rmail.c,v 8.63 2013-11-22 20:51:53 ca Exp $")
/*
* RMAIL -- UUCP mail server.
Modified: stable/0.8/contrib/sendmail/smrsh/Makefile
===================================================================
--- stable/0.8/contrib/sendmail/smrsh/Makefile 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/smrsh/Makefile 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.2 2006-02-25 02:33:57 laffer1 Exp $
+# $Id: Makefile,v 8.5 1999-09-23 22:36:43 ca Exp $
SHELL= /bin/sh
BUILD= ./Build
Modified: stable/0.8/contrib/sendmail/smrsh/Makefile.m4
===================================================================
--- stable/0.8/contrib/sendmail/smrsh/Makefile.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/smrsh/Makefile.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-dnl $Id: Makefile.m4,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+dnl $Id: Makefile.m4,v 8.36 2006-06-28 21:08:04 ca Exp $
include(confBUILDTOOLSDIR`/M4/switch.m4')
define(`confREQUIRE_LIBSM', `true')
Modified: stable/0.8/contrib/sendmail/smrsh/README
===================================================================
--- stable/0.8/contrib/sendmail/smrsh/README 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/smrsh/README 2016-10-01 17:46:48 UTC (rev 9102)
@@ -163,4 +163,4 @@
host.domain# /usr/sbin/sendmail -bd -q30m
-$Revision: 1.1.1.3 $, Last updated $Date: 2008-05-28 21:04:00 $
+$Revision: 8.10 $, Last updated $Date: 2008-02-12 16:40:06 $
Copied: stable/0.8/contrib/sendmail/smrsh/smrsh.0 (from rev 9097, trunk/contrib/sendmail/smrsh/smrsh.0)
===================================================================
--- stable/0.8/contrib/sendmail/smrsh/smrsh.0 (rev 0)
+++ stable/0.8/contrib/sendmail/smrsh/smrsh.0 2016-10-01 17:46:48 UTC (rev 9102)
@@ -0,0 +1,65 @@
+SMRSH(8) SMRSH(8)
+
+
+
+NNAAMMEE
+ smrsh - restricted shell for sendmail
+
+SSYYNNOOPPSSIISS
+ ssmmrrsshh --cc command
+
+DDEESSCCRRIIPPTTIIOONN
+ The _s_m_r_s_h program is intended as a replacement for _s_h for use in the
+ ``prog'' mailer in _s_e_n_d_m_a_i_l(8) configuration files. It sharply limits
+ the commands that can be run using the ``|program'' syntax of _s_e_n_d_m_a_i_l
+ in order to improve the over all security of your system. Briefly,
+ even if a ``bad guy'' can get sendmail to run a program without going
+ through an alias or forward file, _s_m_r_s_h limits the set of programs that
+ he or she can execute.
+
+ Briefly, _s_m_r_s_h limits programs to be in a single directory, by default
+ /usr/adm/sm.bin, allowing the system administrator to choose the set of
+ acceptable commands, and to the shell builtin commands ``exec'',
+ ``exit'', and ``echo''. It also rejects any commands with the charac-
+ ters ``', `<', `>', `;', `$', `(', `)', `\r' (carriage return), or `\n'
+ (newline) on the command line to prevent ``end run'' attacks. It
+ allows ``||'' and ``&&'' to enable commands like: ``"|exec
+ /usr/local/bin/filter || exit 75"''
+
+ Initial pathnames on programs are stripped, so forwarding to
+ ``/usr/ucb/vacation'', ``/usr/bin/vacation'',
+ ``/home/server/mydir/bin/vacation'', and ``vacation'' all actually for-
+ ward to ``/usr/adm/sm.bin/vacation''.
+
+ System administrators should be conservative about populating the
+ sm.bin directory. For example, a reasonable additions is _v_a_c_a_t_i_o_n(1),
+ and the like. No matter how brow-beaten you may be, never include any
+ shell or shell-like program (such as _p_e_r_l(1)) in the sm.bin directory.
+ Note that this does not restrict the use of shell or perl scripts in
+ the sm.bin directory (using the ``#!'' syntax); it simply disallows
+ execution of arbitrary programs. Also, including mail filtering pro-
+ grams such as _p_r_o_c_m_a_i_l(1) is a very bad idea. _p_r_o_c_m_a_i_l(1) allows users
+ to run arbitrary programs in their _p_r_o_c_m_a_i_l_r_c(5).
+
+CCOOMMPPIILLAATTIIOONN
+ Compilation should be trivial on most systems. You may need to use
+ -DSMRSH_PATH=\"_p_a_t_h\" to adjust the default search path (defaults to
+ ``/bin:/usr/bin:/usr/ucb'') and/or -DSMRSH_CMDDIR=\"_d_i_r\" to change the
+ default program directory (defaults to ``/usr/adm/sm.bin'').
+
+FFIILLEESS
+ /usr/adm/sm.bin - default directory for restricted programs on most OSs
+
+ /var/adm/sm.bin - directory for restricted programs on HP UX and
+ Solaris
+
+ /usr/libexec/sm.bin - directory for restricted programs on FreeBSD (>=
+ 3.3) and DragonFly BSD
+
+
+SSEEEE AALLSSOO
+ sendmail(8)
+
+
+
+ $Date: 2013-11-22 20:52:00 $ SMRSH(8)
Modified: stable/0.8/contrib/sendmail/smrsh/smrsh.8
===================================================================
--- stable/0.8/contrib/sendmail/smrsh/smrsh.8 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/smrsh/smrsh.8 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers.
+.\" Copyright (c) 1998-2004 Proofpoint, Inc. and its suppliers.
.\" All rights reserved.
.\" Copyright (c) 1993 Eric P. Allman. All rights reserved.
.\" Copyright (c) 1993
@@ -9,9 +9,9 @@
.\" the sendmail distribution.
.\"
.\"
-.\" $Id: smrsh.8,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $
+.\" $Id: smrsh.8,v 8.23 2013-11-22 20:52:00 ca Exp $
.\"
-.TH SMRSH 8 "$Date: 2006-08-04 02:03:05 $"
+.TH SMRSH 8 "$Date: 2013-11-22 20:52:00 $"
.SH NAME
smrsh \- restricted shell for sendmail
.SH SYNOPSIS
Modified: stable/0.8/contrib/sendmail/smrsh/smrsh.c
===================================================================
--- stable/0.8/contrib/sendmail/smrsh/smrsh.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/smrsh/smrsh.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2004 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1993 Eric P. Allman. All rights reserved.
* Copyright (c) 1993
@@ -14,13 +14,13 @@
#include <sm/gen.h>
SM_IDSTR(copyright,
-"@(#) Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers.\n\
+"@(#) Copyright (c) 1998-2004 Proofpoint, Inc. and its suppliers.\n\
All rights reserved.\n\
Copyright (c) 1993 Eric P. Allman. All rights reserved.\n\
Copyright (c) 1993\n\
The Regents of the University of California. All rights reserved.\n")
-SM_IDSTR(id, "@(#)$Id: smrsh.c,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: smrsh.c,v 8.66 2013-11-22 20:52:00 ca Exp $")
/*
** SMRSH -- sendmail restricted shell
Modified: stable/0.8/contrib/sendmail/src/Makefile
===================================================================
--- stable/0.8/contrib/sendmail/src/Makefile 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/Makefile 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.3 2007-11-23 22:10:29 laffer1 Exp $
+# $Id: Makefile,v 8.12 2006-08-29 22:00:11 ca Exp $
SHELL= /bin/sh
BUILD= ./Build
Modified: stable/0.8/contrib/sendmail/src/Makefile.m4
===================================================================
--- stable/0.8/contrib/sendmail/src/Makefile.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/Makefile.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-dnl $Id: Makefile.m4,v 1.1.1.7 2013-08-14 22:35:47 laffer1 Exp $
+dnl $Id: Makefile.m4,v 8.143 2013-09-04 19:49:04 ca Exp $
include(confBUILDTOOLSDIR`/M4/switch.m4')
define(`confREQUIRE_LIBSM', `true')
Modified: stable/0.8/contrib/sendmail/src/README
===================================================================
--- stable/0.8/contrib/sendmail/src/README 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/README 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2004 Proofpoint, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
# Copyright (c) 1988
@@ -9,7 +9,7 @@
# the sendmail distribution.
#
#
-# $Id: README,v 1.1.1.6 2010-01-10 20:14:37 laffer1 Exp $
+# $Id: README,v 8.393 2013-11-22 20:51:54 ca Exp $
#
This directory contains the source files for sendmail(TM).
@@ -31,7 +31,7 @@
cd ../doc/op ; make op.ps op.txt
-Sendmail is a trademark of Sendmail, Inc.
+Sendmail is a trademark of Proofpoint, Inc.
US Patent Numbers 6865671, 6986037.
@@ -189,10 +189,11 @@
uses the same syntax as milters the specify the remote endpoint,
e.g.:
-Ksocket mySocketMap inet:12345 at 127.0.0.1
+KmySocketMap socket inet:12345 at 127.0.0.1
See doc/op/op.me for details.
+
+---------------+
| COMPILE FLAGS |
+---------------+
@@ -630,8 +631,7 @@
http://egd.sourceforge.net/ . It should be used to
seed the PRNG for STARTTLS if HASURANDOMDEV is not defined.
STARTTLS Enables SMTP STARTTLS (RFC 2487). This requires OpenSSL
- (http://www.OpenSSL.org/); use OpenSSL 0.9.5a or later
- (if compatible with this version), do not use 0.9.3.
+ (http://www.OpenSSL.org/); use OpenSSL 0.9.8zc or later.
See STARTTLS COMPILATION AND CONFIGURATION for further
information.
TLS_NO_RSA Turn off support for RSA algorithms in STARTTLS.
@@ -653,6 +653,9 @@
chattr +S on Linux.
DBMMODE The default file permissions to use when creating new
database files for maps and aliases. Defaults to 0640.
+IPV6_FULL Use uncompressed IPv6 addresses (set by default). This
+ permits a zero subnet to have a more specific match,
+ such as different map entries for IPv6:0:0 vs IPv6:0.
Generic notice: If you enable a compile time option that needs
libraries or include files that don't come with sendmail or are
@@ -1733,6 +1736,7 @@
Problem noted by Daniel Krones, solution suggested by
Anthony Howe.
+
+--------------+
| MANUAL PAGES |
+--------------+
@@ -1848,4 +1852,4 @@
version.c The version number and information about this
version of sendmail.
-(Version $Revision: 1.1.1.6 $, last update $Date: 2010-01-10 20:14:37 $ )
+(Version $Revision: 8.393 $, last update $Date: 2013-11-22 20:51:54 $ )
Modified: stable/0.8/contrib/sendmail/src/SECURITY
===================================================================
--- stable/0.8/contrib/sendmail/src/SECURITY 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/SECURITY 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000-2002 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -5,7 +5,7 @@
# forth in the LICENSE file which can be found at the top level of
# the sendmail distribution.
#
-# $Id: SECURITY,v 1.1.1.2 2006-02-25 02:33:58 laffer1 Exp $
+# $Id: SECURITY,v 1.52 2013-11-22 20:51:54 ca Exp $
#
This file gives some hints how to configure and run sendmail for
Modified: stable/0.8/contrib/sendmail/src/TRACEFLAGS
===================================================================
--- stable/0.8/contrib/sendmail/src/TRACEFLAGS 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/TRACEFLAGS 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# $Id: TRACEFLAGS,v 1.1.1.6 2013-08-14 22:35:47 laffer1 Exp $
+# $Id: TRACEFLAGS,v 8.53 2013-11-27 01:27:03 gshapiro Exp $
0, 4 main.c main canonical name, UUCP node name, a.k.a.s
0, 15 main.c main print configuration
0, 44 util.c printav print address of each string
@@ -87,11 +87,17 @@
71,>99 milter.c quarantine on errors
73 queue.c shared memory updates
74,>99 map.c LDAP map defer
+#if _FFR_XCNCT
+75 debug FFR_XC*
+#endif /* _FFR_XCNCT */
80 content length
81 sun remote mode
83 collect.c timeout
84 deliver.c timeout
85 map.c dprintf map
+#if _FFR_PROXY
+87 srvrsmtp.c proxy mode
+#endif
89 conf.c >=8 use sm_dprintf() instead of syslog()
91 mci.c syslogging of MCI cache information
93,>99 * Prevent daemon connection fork for profiling/debugging
@@ -98,7 +104,7 @@
94,>99 srvrsmtp.c cause commands to fail (for protocol testing)
95 srvrsmtp.c AUTH
95 usersmtp.c AUTH
-96 tls.c Activate SSL_CTX_set_info_callback()
+96 tls.c DHparam info, Activate SSL_CTX_set_info_callback()
97 srvrsmtp.c Trace automode settings for I/O
98 * timers
99 main.c avoid backgrounding (no printed output)
Modified: stable/0.8/contrib/sendmail/src/TUNING
===================================================================
--- stable/0.8/contrib/sendmail/src/TUNING 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/TUNING 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# Copyright (c) 2001-2003 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2001-2003, 2014 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -5,7 +5,7 @@
# forth in the LICENSE file which can be found at the top level of
# the sendmail distribution.
#
-# $Id: TUNING,v 1.1.1.3 2007-11-23 22:10:29 laffer1 Exp $
+# $Id: TUNING,v 1.22 2013-11-22 20:51:54 ca Exp $
#
********************************************
@@ -135,7 +135,18 @@
should be added to the .mc file.
+Note: starting with 8.15, sendmail will not ignore temporary map
+lookup failures during header rewriting, which means that DNS lookup
+problems even for headers will cause messages to stay in the queue.
+Hence it is strongly suggested to use the nocanonify feature;
+at least turning it on for the MTA, but maybe disabling it for the
+MSA, i.e., use Modifiers for DaemonPortOptions accordingly.
+As a last resort, it is possible to override the host map to ignore
+temporary failures, e.g.,
+Khost host -t
+However, this can cause inconsistent header rewriting.
+
* Mailing Lists and Large Aliases (1-n Mailing)
-----------------------------------------------
Modified: stable/0.8/contrib/sendmail/src/alias.c
===================================================================
--- stable/0.8/contrib/sendmail/src/alias.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/alias.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2003 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2003 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: alias.c,v 1.1.1.4 2013-08-14 22:35:47 laffer1 Exp $")
+SM_RCSID("@(#)$Id: alias.c,v 8.221 2013-11-22 20:51:54 ca Exp $")
#define SEPARATOR ':'
# define ALIAS_SPEC_SEPARATORS " ,/:"
Modified: stable/0.8/contrib/sendmail/src/aliases
===================================================================
--- stable/0.8/contrib/sendmail/src/aliases 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/aliases 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
#
-# $Id: aliases,v 1.1.1.2 2006-02-25 02:33:58 laffer1 Exp $
+# $Id: aliases,v 8.5 2002-06-05 22:54:26 gshapiro Exp $
# @(#)aliases 8.2 (Berkeley) 3/5/94
#
# Aliases in this file will NOT be expanded in the header from
Copied: stable/0.8/contrib/sendmail/src/aliases.0 (from rev 9097, trunk/contrib/sendmail/src/aliases.0)
===================================================================
--- stable/0.8/contrib/sendmail/src/aliases.0 (rev 0)
+++ stable/0.8/contrib/sendmail/src/aliases.0 2016-10-01 17:46:48 UTC (rev 9102)
@@ -0,0 +1,89 @@
+ALIASES(5) ALIASES(5)
+
+
+
+NNAAMMEE
+ aliases - aliases file for sendmail
+
+SSYYNNOOPPSSIISS
+ aalliiaasseess
+
+DDEESSCCRRIIPPTTIIOONN
+ This file describes user ID aliases used by sendmail. The file resides
+ in /etc/mail and is formatted as a series of lines of the form
+
+ name: addr_1, addr_2, addr_3, . . .
+
+ The _n_a_m_e is the name to alias, and the _a_d_d_r___n are the aliases for that
+ name. _a_d_d_r___n can be another alias, a local username, a local filename,
+ a command, an include file, or an external address.
+
+ LLooccaall UUsseerrnnaammee
+ username
+
+ The username must be available via getpwnam(3).
+
+ LLooccaall FFiilleennaammee
+ /path/name
+
+ Messages are appended to the file specified by the full pathname
+ (starting with a slash (/))
+
+ CCoommmmaanndd
+ |command
+
+ A command starts with a pipe symbol (|), it receives messages
+ via standard input.
+
+ IInncclluuddee FFiillee
+ :include: /path/name
+
+ The aliases in pathname are added to the aliases for _n_a_m_e_.
+
+ EE--MMaaiill AAddddrreessss
+ user at domain
+
+ An e-mail address in RFC 822 format.
+
+ Lines beginning with white space are continuation lines. Another way
+ to continue lines is by placing a backslash directly before a newline.
+ Lines beginning with # are comments.
+
+ Aliasing occurs only on local names. Loops can not occur, since no
+ message will be sent to any person more than once.
+
+ If an alias is found for _n_a_m_e, sendmail then checks for an alias for
+ _o_w_n_e_r_-_n_a_m_e. If it is found and the result of the lookup expands to a
+ single address, the envelope sender address of the message is rewritten
+ to that address. If it is found and the result expands to more than
+ one address, the envelope sender address is changed to _o_w_n_e_r_-_n_a_m_e.
+
+ After aliasing has been done, local and valid recipients who have a
+ ``.forward'' file in their home directory have messages forwarded to
+ the list of users defined in that file.
+
+ This is only the raw data file; the actual aliasing information is
+ placed into a binary format in the file /etc/mail/aliases.db using the
+ program newaliases(1). A newaliases command should be executed each
+ time the aliases file is changed for the change to take effect.
+
+SSEEEE AALLSSOO
+ newaliases(1), dbm(3), dbopen(3), db_open(3), sendmail(8)
+
+ _S_E_N_D_M_A_I_L _I_n_s_t_a_l_l_a_t_i_o_n _a_n_d _O_p_e_r_a_t_i_o_n _G_u_i_d_e_.
+
+ _S_E_N_D_M_A_I_L _A_n _I_n_t_e_r_n_e_t_w_o_r_k _M_a_i_l _R_o_u_t_e_r_.
+
+BBUUGGSS
+ If you have compiled sendmail with DBM support instead of NEWDB, you
+ may have encountered problems in dbm(3) restricting a single alias to
+ about 1000 bytes of information. You can get longer aliases by
+ ``chaining''; that is, make the last name in the alias be a dummy name
+ which is a continuation alias.
+
+HHIISSTTOORRYY
+ The aalliiaasseess file format appeared in 4.0BSD.
+
+
+
+ $Date: 2013-11-22 20:51:55 $ ALIASES(5)
Modified: stable/0.8/contrib/sendmail/src/aliases.5
===================================================================
--- stable/0.8/contrib/sendmail/src/aliases.5 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/aliases.5 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
+.\" Copyright (c) 1998-2000 Proofpoint, Inc. and its suppliers.
.\" All rights reserved.
.\" Copyright (c) 1983, 1997 Eric P. Allman. All rights reserved.
.\" Copyright (c) 1985, 1991, 1993
@@ -9,9 +9,9 @@
.\" the sendmail distribution.
.\"
.\"
-.\" $Id: aliases.5,v 1.1.1.2 2006-02-25 02:33:58 laffer1 Exp $
+.\" $Id: aliases.5,v 8.20 2013-11-22 20:51:55 ca Exp $
.\"
-.TH ALIASES 5 "$Date: 2006-02-25 02:33:58 $"
+.TH ALIASES 5 "$Date: 2013-11-22 20:51:55 $"
.SH NAME
aliases
\- aliases file for sendmail
Modified: stable/0.8/contrib/sendmail/src/arpadate.c
===================================================================
--- stable/0.8/contrib/sendmail/src/arpadate.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/arpadate.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: arpadate.c,v 1.1.1.3 2007-11-23 22:10:29 laffer1 Exp $")
+SM_RCSID("@(#)$Id: arpadate.c,v 8.32 2013-11-22 20:51:55 ca Exp $")
/*
** ARPADATE -- Create date in ARPANET format
Modified: stable/0.8/contrib/sendmail/src/bf.c
===================================================================
--- stable/0.8/contrib/sendmail/src/bf.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/bf.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2002, 2004, 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2002, 2004, 2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -18,7 +18,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: bf.c,v 1.1.1.3 2006-08-04 02:03:04 laffer1 Exp $")
+SM_RCSID("@(#)$Id: bf.c,v 8.63 2013-11-22 20:51:55 ca Exp $")
#include <sys/types.h>
#include <sys/stat.h>
@@ -695,7 +695,8 @@
sm_dprintf("bfcommit(%s): to disk\n", bfp->bf_filename);
if (tTd(58, 32))
sm_dprintf("bfcommit(): filemode %o flags %ld\n",
- bfp->bf_filemode, bfp->bf_flags);
+ (unsigned int) bfp->bf_filemode,
+ bfp->bf_flags);
}
if (stat(bfp->bf_filename, &st) == 0)
Modified: stable/0.8/contrib/sendmail/src/bf.h
===================================================================
--- stable/0.8/contrib/sendmail/src/bf.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/bf.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2002 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2002 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: bf.h,v 1.1.1.2 2006-02-25 02:33:58 laffer1 Exp $
+ * $Id: bf.h,v 8.17 2013-11-22 20:51:55 ca Exp $
*
* Contributed by Exactis.com, Inc.
*
Modified: stable/0.8/contrib/sendmail/src/collect.c
===================================================================
--- stable/0.8/contrib/sendmail/src/collect.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/collect.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2006, 2008 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2006, 2008 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: collect.c,v 1.1.1.7 2013-08-14 22:35:47 laffer1 Exp $")
+SM_RCSID("@(#)$Id: collect.c,v 8.287 2013-11-22 20:51:55 ca Exp $")
static void eatfrom __P((char *volatile, ENVELOPE *));
static void collect_doheader __P((ENVELOPE *));
@@ -59,7 +59,7 @@
sm_dprintf("collect: rscheck(\"check_eoh\", \"%s $| %s\")\n",
hnum, hsize);
(void) rscheck("check_eoh", hnum, hsize, e, RSF_UNSTRUCTURED|RSF_COUNT,
- 3, NULL, e->e_id, NULL);
+ 3, NULL, e->e_id, NULL, NULL);
/*
** Process the header,
@@ -297,6 +297,7 @@
int hdrslen;
int numhdrs;
int afd;
+ int old_rd_tmo;
unsigned char *pbp;
unsigned char peekbuf[8];
char bufbuf[MAXLINE];
@@ -311,7 +312,7 @@
dbto = smtpmode ? ((int) TimeOuts.to_datablock * 1000)
: SM_TIME_FOREVER;
sm_io_setinfo(fp, SM_IO_WHAT_TIMEOUT, &dbto);
- set_tls_rd_tmo(TimeOuts.to_datablock);
+ old_rd_tmo = set_tls_rd_tmo(TimeOuts.to_datablock);
c = SM_IO_EOF;
inputerr = false;
headeronly = hdrp != NULL;
@@ -720,7 +721,7 @@
}
if (headeronly)
- return;
+ goto end;
if (mstate != MS_BODY)
{
@@ -940,6 +941,9 @@
+ e->e_nrcpts * WkRecipFact;
markstats(e, (ADDRESS *) NULL, STATS_NORMAL);
}
+
+ end:
+ (void) set_tls_rd_tmo(old_rd_tmo);
}
/*
@@ -1026,8 +1030,8 @@
#endif /* 0 */
}
else
- syserr("421 4.3.0 collect: Cannot write %s (%s, uid=%d, gid=%d)",
- dfname, msg, (int) geteuid(), (int) getegid());
+ syserr("421 4.3.0 collect: Cannot write %s (%s, uid=%ld, gid=%ld)",
+ dfname, msg, (long) geteuid(), (long) getegid());
if (sm_io_reopen(SmFtStdio, SM_TIME_DEFAULT, SM_PATH_DEVNULL,
SM_IO_WRONLY, NULL, df) == NULL)
sm_syslog(LOG_ERR, e->e_id,
Modified: stable/0.8/contrib/sendmail/src/conf.c
===================================================================
--- stable/0.8/contrib/sendmail/src/conf.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/conf.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2013 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2013 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: conf.c,v 1.1.1.8 2013-08-14 22:35:48 laffer1 Exp $")
+SM_RCSID("@(#)$Id: conf.c,v 8.1192 2014-01-27 18:23:21 ca Exp $")
#include <sm/sendmail.h>
#include <sendmail/pathnames.h>
@@ -229,10 +229,8 @@
{ "worldwritableforwardfile", DBS_WORLDWRITABLEFORWARDFILE },
{ "worldwritableincludefile", DBS_WORLDWRITABLEINCLUDEFILE },
{ "groupreadablekeyfile", DBS_GROUPREADABLEKEYFILE },
-#if _FFR_GROUPREADABLEAUTHINFOFILE
- { "groupreadableadefaultauthinfofile",
+ { "groupreadabledefaultauthinfofile",
DBS_GROUPREADABLEAUTHINFOFILE },
-#endif /* _FFR_GROUPREADABLEAUTHINFOFILE */
{ NULL, 0 }
};
@@ -304,9 +302,9 @@
}
TrustedUid = 0;
if (tTd(37, 4))
- sm_dprintf("setdefaults: DefUser=%s, DefUid=%d, DefGid=%d\n",
+ sm_dprintf("setdefaults: DefUser=%s, DefUid=%ld, DefGid=%ld\n",
DefUser != NULL ? DefUser : "<1:1>",
- (int) DefUid, (int) DefGid);
+ (long) DefUid, (long) DefGid);
CheckpointInterval = 10; /* option C */
MaxHopCount = 25; /* option h */
set_delivery_mode(SM_FORK, e); /* option d */
@@ -365,6 +363,8 @@
#endif /* SASL */
#if STARTTLS
TLS_Srv_Opts = TLS_I_SRV;
+ if (NULL == EVP_digest)
+ EVP_digest = EVP_md5();
#endif /* STARTTLS */
#ifdef HESIOD_INIT
HesiodContext = NULL;
@@ -379,6 +379,9 @@
}
else
InetMode = AF_INET;
+#if !IPV6_FULL
+ UseCompressedIPv6Addresses = true;
+#endif
#else /* NETINET6 */
InetMode = AF_INET;
#endif /* NETINET6 */
@@ -399,6 +402,9 @@
BadRcptThrottleDelay = 1;
#endif /* _FFR_RCPTTHROTDELAY */
ConnectionRateWindowSize = 60;
+#if _FFR_BOUNCE_QUEUE
+ BounceQueue = NOQGRP;
+#endif /* _FFR_BOUNCE_QUEUE */
setupmaps();
setupqueues();
setupmailers();
@@ -423,8 +429,8 @@
? "nobody" : defpwent->pw_name,
sizeof(defuserbuf));
if (tTd(37, 4))
- sm_dprintf("setdefuser: DefUid=%d, DefUser=%s\n",
- (int) DefUid, DefUser);
+ sm_dprintf("setdefuser: DefUid=%ld, DefUser=%s\n",
+ (long) DefUid, DefUser);
}
/*
** SETUPQUEUES -- initialize default queues
@@ -665,6 +671,11 @@
dequote_init, null_map_open, null_map_close,
arith_map_lookup, null_map_store);
+ /* "arpa" map -- IP -> arpa */
+ MAPDEF("arpa", NULL, 0,
+ dequote_init, null_map_open, null_map_close,
+ arpa_map_lookup, null_map_store);
+
#if SOCKETMAP
/* arbitrary daemons */
MAPDEF("socket", NULL, MCF_ALIASOK,
@@ -2292,7 +2303,7 @@
# define D_MSG_LA "delaying connections on daemon %s: load average=%d >= %d"
/* sleep to flatten out connection load */
sm_setproctitle(true, e, D_MSG_LA, Daemons[dn].d_name,
- CurrentLA, limit);
+ CurrentLA, limit);
if (LogLevel > 8 && (now = curtime()) > log_delay)
{
sm_syslog(LOG_INFO, NOQID, D_MSG_LA,
@@ -2773,7 +2784,7 @@
return SIGFUNC_RETURN;
}
/*
-** GETDTABLESIZE -- return number of file descriptors
+** GETDTSIZE -- return number of file descriptors
**
** Only on non-BSD systems
**
@@ -3594,8 +3605,8 @@
uid_t euid = geteuid();
errno = save_errno;
- syserr("cannot lockf(%s%s, fd=%d, type=%o, omode=%o, euid=%d)",
- filename, ext, fd, type, omode, euid);
+ syserr("cannot lockf(%s%s, fd=%d, type=%o, omode=%o, euid=%ld)",
+ filename, ext, fd, type, omode, (long) euid);
dumpfd(fd, true, true);
}
# else /* !HASFLOCK */
@@ -3624,8 +3635,8 @@
uid_t euid = geteuid();
errno = save_errno;
- syserr("cannot flock(%s%s, fd=%d, type=%o, omode=%o, euid=%d)",
- filename, ext, fd, type, omode, euid);
+ syserr("cannot flock(%s%s, fd=%d, type=%o, omode=%o, euid=%ld)",
+ filename, ext, fd, type, omode, (long) euid);
dumpfd(fd, true, true);
}
# endif /* !HASFLOCK */
@@ -4002,8 +4013,8 @@
hostname, anynet_ntoa(sap));
connection_rate_check(sap, e);
- if (rscheck("check_relay", hostname, anynet_ntoa(sap),
- e, RSF_RMCOMM|RSF_COUNT, 3, NULL, NOQID, NULL) != EX_OK)
+ if (rscheck("check_relay", hostname, anynet_ntoa(sap), e,
+ RSF_RMCOMM|RSF_COUNT, 3, NULL, NOQID, NULL, NULL) != EX_OK)
{
static char reject[BUFSIZ*2];
extern char MsgBuf[];
@@ -4221,9 +4232,17 @@
int flags;
int *err;
{
- bool resv6 = true;
struct hostent *h;
+# if HAS_GETHOSTBYNAME2
+ h = gethostbyname2(name, family);
+ if (h == NULL)
+ *err = h_errno;
+ return h;
+
+# else /* HAS_GETHOSTBYNAME2 */
+ bool resv6 = true;
+
if (family == AF_INET6)
{
/* From RFC2133, section 6.1 */
@@ -4234,8 +4253,20 @@
h = gethostbyname(name);
if (!resv6)
_res.options &= ~RES_USE_INET6;
- *err = h_errno;
+
+ /* the function is supposed to return only the requested family */
+ if (h != NULL && h->h_addrtype != family)
+ {
+# if NETINET6
+ freehostent(h);
+# endif /* NETINET6 */
+ h = NULL;
+ *err = NO_DATA;
+ }
+ else
+ *err = h_errno;
return h;
+# endif /* HAS_GETHOSTBYNAME2 */
}
static struct hostent *
@@ -4363,6 +4394,17 @@
}
}
#endif /* (SOLARIS > 10000 && SOLARIS < 20400) || (defined(SOLARIS) && SOLARIS < 204) || (defined(sony_news) && defined(__svr4)) */
+
+ /* the function is supposed to return only the requested family */
+ if (h != NULL && h->h_addrtype != family)
+ {
+# if NETINET6
+ freehostent(h);
+# endif /* NETINET6 */
+ h = NULL;
+ SM_SET_H_ERRNO(NO_DATA);
+ }
+
if (tTd(61, 10))
{
if (h == NULL)
@@ -4372,13 +4414,12 @@
sm_dprintf("%s\n", h->h_name);
if (tTd(61, 11))
{
+ struct in_addr ia;
+ size_t i;
#if NETINET6
struct in6_addr ia6;
char buf6[INET6_ADDRSTRLEN];
-#else /* NETINET6 */
- struct in_addr ia;
#endif /* NETINET6 */
- size_t i;
if (h->h_aliases != NULL)
for (i = 0; h->h_aliases[i] != NULL;
@@ -4389,16 +4430,23 @@
{
char *addr;
+ addr = NULL;
#if NETINET6
- memmove(&ia6, h->h_addr_list[i],
- IN6ADDRSZ);
- addr = anynet_ntop(&ia6,
- buf6, sizeof(buf6));
-#else /* NETINET6 */
- memmove(&ia, h->h_addr_list[i],
- INADDRSZ);
- addr = (char *) inet_ntoa(ia);
+ if (h->h_addrtype == AF_INET6)
+ {
+ memmove(&ia6, h->h_addr_list[i],
+ IN6ADDRSZ);
+ addr = anynet_ntop(&ia6,
+ buf6, sizeof(buf6));
+ }
+ else
#endif /* NETINET6 */
+ /* "else" in #if code above */
+ {
+ memmove(&ia, h->h_addr_list[i],
+ INADDRSZ);
+ addr = (char *) inet_ntoa(ia);
+ }
if (addr != NULL)
sm_dprintf("\taddr: %s\n", addr);
}
@@ -5362,7 +5410,7 @@
SM_VA_START(ap, fmt);
n = sm_vsnprintf(buf, bufsize, fmt, ap);
SM_VA_END(ap);
- SM_ASSERT(n > 0);
+ SM_ASSERT(n >= 0);
if (n < bufsize)
break;
@@ -5692,148 +5740,155 @@
{
#if ALLOW_255
"ALLOW_255",
-#endif /* ALLOW_255 */
+#endif
#if NAMED_BIND
# if DNSMAP
"DNSMAP",
-# endif /* DNSMAP */
-#endif /* NAMED_BIND */
+# endif
+#endif
#if EGD
"EGD",
-#endif /* EGD */
+#endif
#if HESIOD
"HESIOD",
-#endif /* HESIOD */
+#endif
+#if HESIOD_ALLOW_NUMERIC_LOGIN
+ "HESIOD_ALLOW_NUMERIC_LOGIN",
+#endif
#if HES_GETMAILHOST
"HES_GETMAILHOST",
-#endif /* HES_GETMAILHOST */
+#endif
+#if IPV6_FULL
+ /* Use uncompressed IPv6 address format (no "::") by default */
+ "IPV6_FULL",
+#endif
#if LDAPMAP
"LDAPMAP",
-#endif /* LDAPMAP */
+#endif
#if LDAP_REFERRALS
"LDAP_REFERRALS",
-#endif /* LDAP_REFERRALS */
+#endif
#if LOG
"LOG",
-#endif /* LOG */
+#endif
#if MAP_NSD
"MAP_NSD",
-#endif /* MAP_NSD */
+#endif
#if MAP_REGEX
"MAP_REGEX",
-#endif /* MAP_REGEX */
+#endif
#if MATCHGECOS
"MATCHGECOS",
-#endif /* MATCHGECOS */
+#endif
#if MILTER
"MILTER",
-#endif /* MILTER */
+#endif
#if MIME7TO8
"MIME7TO8",
-#endif /* MIME7TO8 */
+#endif
#if MIME7TO8_OLD
"MIME7TO8_OLD",
-#endif /* MIME7TO8_OLD */
+#endif
#if MIME8TO7
"MIME8TO7",
-#endif /* MIME8TO7 */
+#endif
#if NAMED_BIND
"NAMED_BIND",
-#endif /* NAMED_BIND */
+#endif
#if NDBM
"NDBM",
-#endif /* NDBM */
+#endif
#if NETINET
"NETINET",
-#endif /* NETINET */
+#endif
#if NETINET6
"NETINET6",
-#endif /* NETINET6 */
+#endif
#if NETINFO
"NETINFO",
-#endif /* NETINFO */
+#endif
#if NETISO
"NETISO",
-#endif /* NETISO */
+#endif
#if NETNS
"NETNS",
-#endif /* NETNS */
+#endif
#if NETUNIX
"NETUNIX",
-#endif /* NETUNIX */
+#endif
#if NETX25
"NETX25",
-#endif /* NETX25 */
+#endif
#if NEWDB
"NEWDB",
-#endif /* NEWDB */
+#endif
#if NIS
"NIS",
-#endif /* NIS */
+#endif
#if NISPLUS
"NISPLUS",
-#endif /* NISPLUS */
+#endif
#if NO_DH
"NO_DH",
-#endif /* NO_DH */
+#endif
#if PH_MAP
"PH_MAP",
-#endif /* PH_MAP */
+#endif
#ifdef PICKY_HELO_CHECK
"PICKY_HELO_CHECK",
-#endif /* PICKY_HELO_CHECK */
+#endif
#if PIPELINING
"PIPELINING",
-#endif /* PIPELINING */
+#endif
#if SASL
# if SASL >= 20000
"SASLv2",
# else /* SASL >= 20000 */
"SASL",
-# endif /* SASL >= 20000 */
-#endif /* SASL */
+# endif
+#endif
#if SCANF
"SCANF",
-#endif /* SCANF */
+#endif
#if SM_LDAP_ERROR_ON_MISSING_ARGS
"SM_LDAP_ERROR_ON_MISSING_ARGS",
-#endif /* SM_LDAP_ERROR_ON_MISSING_ARGS */
+#endif
#if SMTPDEBUG
"SMTPDEBUG",
-#endif /* SMTPDEBUG */
+#endif
#if SOCKETMAP
"SOCKETMAP",
-#endif /* SOCKETMAP */
+#endif
#if STARTTLS
"STARTTLS",
-#endif /* STARTTLS */
+#endif
#if SUID_ROOT_FILES_OK
"SUID_ROOT_FILES_OK",
-#endif /* SUID_ROOT_FILES_OK */
+#endif
#if TCPWRAPPERS
"TCPWRAPPERS",
-#endif /* TCPWRAPPERS */
+#endif
#if TLS_NO_RSA
"TLS_NO_RSA",
-#endif /* TLS_NO_RSA */
+#endif
#if TLS_VRFY_PER_CTX
"TLS_VRFY_PER_CTX",
-#endif /* TLS_VRFY_PER_CTX */
+#endif
#if USERDB
"USERDB",
-#endif /* USERDB */
+#endif
#if USE_LDAP_INIT
"USE_LDAP_INIT",
-#endif /* USE_LDAP_INIT */
+#endif
#if USE_TTYPATH
"USE_TTYPATH",
-#endif /* USE_TTYPATH */
+#endif
#if XDEBUG
"XDEBUG",
-#endif /* XDEBUG */
+#endif
#if XLA
"XLA",
-#endif /* XLA */
+#endif
NULL
};
@@ -5846,169 +5901,169 @@
{
#if ADDRCONFIG_IS_BROKEN
"ADDRCONFIG_IS_BROKEN",
-#endif /* ADDRCONFIG_IS_BROKEN */
+#endif
#ifdef AUTO_NETINFO_HOSTS
"AUTO_NETINFO_HOSTS",
-#endif /* AUTO_NETINFO_HOSTS */
+#endif
#ifdef AUTO_NIS_ALIASES
"AUTO_NIS_ALIASES",
-#endif /* AUTO_NIS_ALIASES */
+#endif
#if BROKEN_RES_SEARCH
"BROKEN_RES_SEARCH",
-#endif /* BROKEN_RES_SEARCH */
+#endif
#ifdef BSD4_4_SOCKADDR
"BSD4_4_SOCKADDR",
-#endif /* BSD4_4_SOCKADDR */
+#endif
#if BOGUS_O_EXCL
"BOGUS_O_EXCL",
-#endif /* BOGUS_O_EXCL */
+#endif
#if DEC_OSF_BROKEN_GETPWENT
"DEC_OSF_BROKEN_GETPWENT",
-#endif /* DEC_OSF_BROKEN_GETPWENT */
+#endif
#if FAST_PID_RECYCLE
"FAST_PID_RECYCLE",
-#endif /* FAST_PID_RECYCLE */
+#endif
#if HASCLOSEFROM
"HASCLOSEFROM",
-#endif /* HASCLOSEFROM */
+#endif
#if HASFCHOWN
"HASFCHOWN",
-#endif /* HASFCHOWN */
+#endif
#if HASFCHMOD
"HASFCHMOD",
-#endif /* HASFCHMOD */
+#endif
#if HASFDWALK
"HASFDWALK",
-#endif /* HASFDWALK */
+#endif
#if HASFLOCK
"HASFLOCK",
-#endif /* HASFLOCK */
+#endif
#if HASGETDTABLESIZE
"HASGETDTABLESIZE",
-#endif /* HASGETDTABLESIZE */
+#endif
#if HASGETUSERSHELL
"HASGETUSERSHELL",
-#endif /* HASGETUSERSHELL */
+#endif
#if HASINITGROUPS
"HASINITGROUPS",
-#endif /* HASINITGROUPS */
+#endif
#if HASLDAPGETALIASBYNAME
"HASLDAPGETALIASBYNAME",
-#endif /* HASLDAPGETALIASBYNAME */
+#endif
#if HASLSTAT
"HASLSTAT",
-#endif /* HASLSTAT */
+#endif
#if HASNICE
"HASNICE",
-#endif /* HASNICE */
+#endif
#if HASRANDOM
"HASRANDOM",
-#endif /* HASRANDOM */
+#endif
#if HASRRESVPORT
"HASRRESVPORT",
-#endif /* HASRRESVPORT */
+#endif
#if HASSETEGID
"HASSETEGID",
-#endif /* HASSETEGID */
+#endif
#if HASSETLOGIN
"HASSETLOGIN",
-#endif /* HASSETLOGIN */
+#endif
#if HASSETREGID
"HASSETREGID",
-#endif /* HASSETREGID */
+#endif
#if HASSETRESGID
"HASSETRESGID",
-#endif /* HASSETRESGID */
+#endif
#if HASSETREUID
"HASSETREUID",
-#endif /* HASSETREUID */
+#endif
#if HASSETRLIMIT
"HASSETRLIMIT",
-#endif /* HASSETRLIMIT */
+#endif
#if HASSETSID
"HASSETSID",
-#endif /* HASSETSID */
+#endif
#if HASSETUSERCONTEXT
"HASSETUSERCONTEXT",
-#endif /* HASSETUSERCONTEXT */
+#endif
#if HASSETVBUF
"HASSETVBUF",
-#endif /* HASSETVBUF */
+#endif
#if HAS_ST_GEN
"HAS_ST_GEN",
-#endif /* HAS_ST_GEN */
+#endif
#if HASSRANDOMDEV
"HASSRANDOMDEV",
-#endif /* HASSRANDOMDEV */
+#endif
#if HASURANDOMDEV
"HASURANDOMDEV",
-#endif /* HASURANDOMDEV */
+#endif
#if HASSTRERROR
"HASSTRERROR",
-#endif /* HASSTRERROR */
+#endif
#if HASULIMIT
"HASULIMIT",
-#endif /* HASULIMIT */
+#endif
#if HASUNAME
"HASUNAME",
-#endif /* HASUNAME */
+#endif
#if HASUNSETENV
"HASUNSETENV",
-#endif /* HASUNSETENV */
+#endif
#if HASWAITPID
"HASWAITPID",
-#endif /* HASWAITPID */
+#endif
#if HAVE_NANOSLEEP
"HAVE_NANOSLEEP",
-#endif /* HAVE_NANOSLEEP */
+#endif
#if IDENTPROTO
"IDENTPROTO",
-#endif /* IDENTPROTO */
+#endif
#if IP_SRCROUTE
"IP_SRCROUTE",
-#endif /* IP_SRCROUTE */
+#endif
#if O_EXLOCK && HASFLOCK && !BOGUS_O_EXCL
"LOCK_ON_OPEN",
-#endif /* O_EXLOCK && HASFLOCK && !BOGUS_O_EXCL */
+#endif
#if MILTER_NO_NAGLE
"MILTER_NO_NAGLE ",
-#endif /* MILTER_NO_NAGLE */
+#endif
#if NEEDFSYNC
"NEEDFSYNC",
-#endif /* NEEDFSYNC */
+#endif
#if NEEDLINK
"NEEDLINK",
-#endif /* NEEDLINK */
+#endif
#if NEEDLOCAL_HOSTNAME_LENGTH
"NEEDLOCAL_HOSTNAME_LENGTH",
-#endif /* NEEDLOCAL_HOSTNAME_LENGTH */
+#endif
#if NEEDSGETIPNODE
"NEEDSGETIPNODE",
-#endif /* NEEDSGETIPNODE */
+#endif
#if NEEDSTRSTR
"NEEDSTRSTR",
-#endif /* NEEDSTRSTR */
+#endif
#if NEEDSTRTOL
"NEEDSTRTOL",
-#endif /* NEEDSTRTOL */
+#endif
#ifdef NO_GETSERVBYNAME
"NO_GETSERVBYNAME",
-#endif /* NO_GETSERVBYNAME */
+#endif
#if NOFTRUNCATE
"NOFTRUNCATE",
-#endif /* NOFTRUNCATE */
+#endif
#if REQUIRES_DIR_FSYNC
"REQUIRES_DIR_FSYNC",
-#endif /* REQUIRES_DIR_FSYNC */
+#endif
#if RLIMIT_NEEDS_SYS_TIME_H
"RLIMIT_NEEDS_SYS_TIME_H",
-#endif /* RLIMIT_NEEDS_SYS_TIME_H */
+#endif
#if SAFENFSPATHCONF
"SAFENFSPATHCONF",
-#endif /* SAFENFSPATHCONF */
+#endif
#if SECUREWARE
"SECUREWARE",
-#endif /* SECUREWARE */
+#endif
#if SFS_TYPE == SFS_4ARGS
"SFS_4ARGS",
#elif SFS_TYPE == SFS_MOUNT
@@ -6028,55 +6083,55 @@
#endif
#if SHARE_V1
"SHARE_V1",
-#endif /* SHARE_V1 */
+#endif
#if SIOCGIFCONF_IS_BROKEN
"SIOCGIFCONF_IS_BROKEN",
-#endif /* SIOCGIFCONF_IS_BROKEN */
+#endif
#if SIOCGIFNUM_IS_BROKEN
"SIOCGIFNUM_IS_BROKEN",
-#endif /* SIOCGIFNUM_IS_BROKEN */
+#endif
#if SNPRINTF_IS_BROKEN
"SNPRINTF_IS_BROKEN",
-#endif /* SNPRINTF_IS_BROKEN */
+#endif
#if SO_REUSEADDR_IS_BROKEN
"SO_REUSEADDR_IS_BROKEN",
-#endif /* SO_REUSEADDR_IS_BROKEN */
+#endif
#if SYS5SETPGRP
"SYS5SETPGRP",
-#endif /* SYS5SETPGRP */
+#endif
#if SYSTEM5
"SYSTEM5",
-#endif /* SYSTEM5 */
+#endif
#if USE_DOUBLE_FORK
"USE_DOUBLE_FORK",
-#endif /* USE_DOUBLE_FORK */
+#endif
#if USE_ENVIRON
"USE_ENVIRON",
-#endif /* USE_ENVIRON */
+#endif
#if USE_SA_SIGACTION
"USE_SA_SIGACTION",
-#endif /* USE_SA_SIGACTION */
+#endif
#if USE_SIGLONGJMP
"USE_SIGLONGJMP",
-#endif /* USE_SIGLONGJMP */
+#endif
#if USEGETCONFATTR
"USEGETCONFATTR",
-#endif /* USEGETCONFATTR */
+#endif
#if USESETEUID
"USESETEUID",
-#endif /* USESETEUID */
+#endif
#ifdef USESYSCTL
"USESYSCTL",
-#endif /* USESYSCTL */
+#endif
#if USE_OPENSSL_ENGINE
"USE_OPENSSL_ENGINE",
-#endif /* USE_OPENSSL_ENGINE */
+#endif
#if USING_NETSCAPE_LDAP
"USING_NETSCAPE_LDAP",
-#endif /* USING_NETSCAPE_LDAP */
+#endif
#ifdef WAITUNION
"WAITUNION",
-#endif /* WAITUNION */
+#endif
NULL
};
@@ -6086,73 +6141,73 @@
char *FFRCompileOptions[] =
{
+#if _FFR_ADD_BCC
+ "_FFR_ADD_BCC",
+#endif
#if _FFR_ADDR_TYPE_MODES
/* more info in {addr_type}, requires m4 changes! */
"_FFR_ADDR_TYPE_MODES",
-#endif /* _FFR_ADDR_TYPE_MODES */
+#endif
+#if _FFR_ALIAS_DETAIL
+ /* try to handle +detail for aliases */
+ "_FFR_ALIAS_DETAIL",
+#endif
#if _FFR_ALLOW_SASLINFO
/* DefaultAuthInfo can be specified by user. */
/* DefaultAuthInfo doesn't really work in 8.13 anymore. */
"_FFR_ALLOW_SASLINFO",
-#endif /* _FFR_ALLOW_SASLINFO */
+#endif
#if _FFR_BADRCPT_SHUTDOWN
/* shut down connection (421) if there are too many bad RCPTs */
"_FFR_BADRCPT_SHUTDOWN",
-#endif /* _FFR_BADRCPT_SHUTDOWN */
+#endif
#if _FFR_BESTMX_BETTER_TRUNCATION
/* Better truncation of list of MX records for dns map. */
"_FFR_BESTMX_BETTER_TRUNCATION",
-#endif /* _FFR_BESTMX_BETTER_TRUNCATION */
+#endif
+#if _FFR_BOUNCE_QUEUE
+ /* Separate, unprocessed queue for DSNs */
+ /* John Gardiner Myers of Proofpoint */
+ "_FFR_BOUNCE_QUEUE",
+#endif
#if _FFR_CATCH_BROKEN_MTAS
/* Deal with MTAs that send a reply during the DATA phase. */
"_FFR_CATCH_BROKEN_MTAS",
-#endif /* _FFR_CATCH_BROKEN_MTAS */
-#if _FFR_CHECKCONFIG
- /* New OpMode to check the configuration file */
- "_FFR_CHECKCONFIG",
-#endif /* _FFR_CHECKCONFIG */
+#endif
#if _FFR_CHK_QUEUE
/* Stricter checks about queue directory permissions. */
"_FFR_CHK_QUEUE",
-#endif /* _FFR_CHK_QUEUE */
+#endif
#if _FFR_CLIENT_SIZE
/* Don't try to send mail if its size exceeds SIZE= of server. */
"_FFR_CLIENT_SIZE",
-#endif /* _FFR_CLIENT_SIZE */
+#endif
#if _FFR_CRLPATH
/* CRLPath; needs documentation; Al Smith */
"_FFR_CRLPATH",
-#endif /* _FFR_CRLPATH */
-#if _FFR_DAEMON_NETUNIX
- /* Allow local (not just TCP) socket connection to server. */
- "_FFR_DAEMON_NETUNIX",
-#endif /* _FFR_DAEMON_NETUNIX */
-#if _FFR_DEPRECATE_MAILER_FLAG_I
- /* What it says :-) */
- "_FFR_DEPRECATE_MAILER_FLAG_I",
-#endif /* _FFR_DEPRECATE_MAILER_FLAG_I */
+#endif
#if _FFR_DM_ONE
/* deliver first TA in background, then queue */
"_FFR_DM_ONE",
-#endif /* _FFR_DM_ONE */
+#endif
#if _FFR_DIGUNIX_SAFECHOWN
/* Properly set SAFECHOWN (include/sm/conf.h) for Digital UNIX */
/* Problem noted by Anne Bennett of Concordia University */
"_FFR_DIGUNIX_SAFECHOWN",
-#endif /* _FFR_DIGUNIX_SAFECHOWN */
+#endif
#if _FFR_DNSMAP_ALIASABLE
/* Allow dns map type to be used for aliases. */
/* Don Lewis of TDK */
"_FFR_DNSMAP_ALIASABLE",
-#endif /* _FFR_DNSMAP_ALIASABLE */
+#endif
#if _FFR_DONTLOCKFILESFORREAD_OPTION
/* Enable DontLockFilesForRead option. */
"_FFR_DONTLOCKFILESFORREAD_OPTION",
-#endif /* _FFR_DONTLOCKFILESFORREAD_OPTION */
+#endif
#if _FFR_DOTTED_USERNAMES
/* Allow usernames with '.' */
"_FFR_DOTTED_USERNAMES",
-#endif /* _FFR_DOTTED_USERNAMES */
+#endif
#if _FFR_DPO_CS
/*
** Make DaemonPortOptions case sensitive.
@@ -6167,11 +6222,11 @@
*/
"_FFR_DPO_CS",
-#endif /* _FFR_DPO_CS */
+#endif
#if _FFR_DPRINTF_MAP
/* dprintf map for logging */
"_FFR_DPRINTF_MAP",
-#endif /* _FFR_DPRINTF_MAP */
+#endif
#if _FFR_DROP_TRUSTUSER_WARNING
/*
** Don't issue this warning:
@@ -6180,24 +6235,20 @@
*/
"_FFR_DROP_TRUSTUSER_WARNING",
-#endif /* _FFR_DROP_TRUSTUSER_WARNING */
+#endif
#if _FFR_EIGHT_BIT_ADDR_OK
/* EightBitAddrOK: allow 8-bit e-mail addresses */
"_FFR_EIGHT_BIT_ADDR_OK",
-#endif /* _FFR_EIGHT_BIT_ADDR_OK */
-#if _FFR_EXPDELAY
- /* exponential queue delay */
- "_FFR_EXPDELAY",
-#endif /* _FFR_EXPDELAY */
+#endif
#if _FFR_EXTRA_MAP_CHECK
/* perform extra checks on $( $) in R lines */
"_FFR_EXTRA_MAP_CHECK",
-#endif /* _FFR_EXTRA_MAP_CHECK */
+#endif
#if _FFR_GETHBN_ExFILE
/*
** According to Motonori Nakamura some gethostbyname()
** implementations (TurboLinux?) may (temporarily) fail
- ** due to a lack of file discriptors. Enabling this FFR
+ ** due to a lack of file descriptors. Enabling this FFR
** will check errno for EMFILE and ENFILE and in case of a match
** cause a temporary error instead of a permanent error.
** The right solution is of course to file a bug against those
@@ -6205,11 +6256,11 @@
*/
"_FFR_GETHBN_ExFILE",
-#endif /* _FFR_GETHBN_ExFILE */
+#endif
#if _FFR_FIPSMODE
/* FIPSMode (if supported by OpenSSL library) */
"_FFR_FIPSMODE",
-#endif /* _FFR_FIPSMODE */
+#endif
#if _FFR_FIX_DASHT
/*
** If using -t, force not sending to argv recipients, even
@@ -6217,51 +6268,66 @@
*/
"_FFR_FIX_DASHT",
-#endif /* _FFR_FIX_DASHT */
+#endif
#if _FFR_FORWARD_SYSERR
/* Cause a "syserr" if forward file isn't "safe". */
"_FFR_FORWARD_SYSERR",
-#endif /* _FFR_FORWARD_SYSERR */
+#endif
#if _FFR_GEN_ORCPT
/* Generate a ORCPT DSN arg if not already provided */
"_FFR_GEN_ORCPT",
-#endif /* _FFR_GEN_ORCPT */
-#if _FFR_GROUPREADABLEAUTHINFOFILE
- /* Allow group readable DefaultAuthInfo file. */
- "_FFR_GROUPREADABLEAUTHINFOFILE",
-#endif /* _FFR_GROUPREADABLEAUTHINFOFILE */
+#endif
#if _FFR_HANDLE_ISO8859_GECOS
/*
** Allow ISO 8859 characters in GECOS field: replace them
- ** ith ASCII "equivalent".
+ ** with ASCII "equivalent".
*/
/* Peter Eriksson of Linkopings universitet */
"_FFR_HANDLE_ISO8859_GECOS",
-#endif /* _FFR_HANDLE_ISO8859_GECOS */
+#endif
+#if _FFR_HANDLE_HDR_RW_TEMPFAIL
+ /*
+ ** Temporary header rewriting problems from remotename() etc
+ ** are not "sticky" for mci (e.g., during queue runs).
+ */
+
+ "_FFR_HANDLE_HDR_RW_TEMPFAIL",
+#endif
#if _FFR_HPUX_NSSWITCH
/* Use nsswitch on HP-UX */
"_FFR_HPUX_NSSWITCH",
-#endif /* _FFR_HPUX_NSSWITCH */
+#endif
#if _FFR_IGNORE_BOGUS_ADDR
/* Ignore addresses for which prescan() failed */
"_FFR_IGNORE_BOGUS_ADDR",
-#endif /* _FFR_IGNORE_BOGUS_ADDR */
+#endif
#if _FFR_IGNORE_EXT_ON_HELO
/* Ignore extensions offered in response to HELO */
"_FFR_IGNORE_EXT_ON_HELO",
-#endif /* _FFR_IGNORE_EXT_ON_HELO */
+#endif
#if _FFR_LINUX_MHNL
/* Set MAXHOSTNAMELEN to 256 (Linux) */
"_FFR_LINUX_MHNL",
-#endif /* _FFR_LINUX_MHNL */
+#endif
#if _FFR_LOCAL_DAEMON
/* Local daemon mode (-bl) which only accepts loopback connections */
"_FFR_LOCAL_DAEMON",
-#endif /* _FFR_LOCAL_DAEMON */
+#endif
+#if _FFR_LOG_MORE1
+ /* log some TLS/AUTH info in from= too */
+ "_FFR_LOG_MORE1",
+#endif
+#if _FFR_LOG_MORE2
+ /* log some TLS info in to= too */
+ "_FFR_LOG_MORE2",
+#endif
+#if _FFR_LOGREPLY
+ "_FFR_LOGREPLY",
+#endif
#if _FFR_MAIL_MACRO
"_FFR_MAIL_MACRO",
-#endif /* _FFR_MAIL_MACRO */
+#endif
#if _FFR_MAXDATASIZE
/*
** It is possible that a header is larger than MILTER_CHUNK_SIZE,
@@ -6271,28 +6337,33 @@
*/
"_FFR_MAXDATASIZE",
-#endif /* _FFR_MAXDATASIZE */
+#endif
#if _FFR_MAX_FORWARD_ENTRIES
/* Try to limit number of .forward entries */
/* (doesn't work) */
/* Randall S. Winchester of the University of Maryland */
"_FFR_MAX_FORWARD_ENTRIES",
-#endif /* _FFR_MAX_FORWARD_ENTRIES */
+#endif
#if _FFR_MAX_SLEEP_TIME
/* Limit sleep(2) time in libsm/clock.c */
"_FFR_MAX_SLEEP_TIME",
-#endif /* _FFR_MAX_SLEEP_TIME */
+#endif
#if _FFR_MDS_NEGOTIATE
/* MaxDataSize negotation with libmilter */
"_FFR_MDS_NEGOTIATE",
-#endif /* _FFR_MDS_NEGOTIATE */
+#endif
#if _FFR_MEMSTAT
/* Check free memory */
"_FFR_MEMSTAT",
-#endif /* _FFR_MEMSTAT */
+#endif
#if _FFR_MILTER_CHECK
"_FFR_MILTER_CHECK",
-#endif /* _FFR_MILTER_CHECK */
+#endif
+#if _FFR_MILTER_CONNECT_REPLYCODE
+ /* milter: propagate replycode returned by connect commands */
+ /* John Gardiner Myers of Proofpoint */
+ "_FFR_MILTER_CONNECT_REPLYCODE ",
+#endif
#if _FFR_MILTER_CONVERT_ALL_LF_TO_CRLF
/*
** milter_body() uses the same conversion algorithm as putbody()
@@ -6310,7 +6381,7 @@
*/
"_FFR_MILTER_CONVERT_ALL_LF_TO_CRLF",
-#endif /* _FFR_MILTER_CONVERT_ALL_LF_TO_CRLF */
+#endif
#if _FFR_MILTER_CHECK_REJECTIONS_TOO
/*
** Also send RCPTs that are rejected by check_rcpt to a milter
@@ -6318,68 +6389,71 @@
*/
"_FFR_MILTER_CHECK_REJECTIONS_TOO",
-#endif /* _FFR_MILTER_CHECK_REJECTIONS_TOO */
+#endif
#if _FFR_MILTER_ENHSC
/* extract enhanced status code from milter replies for dsn= logging */
"_FFR_MILTER_ENHSC",
-#endif /* _FFR_MILTER_ENHSC */
+#endif
#if _FFR_MIME7TO8_OLD
/* Old mime7to8 code, the new is broken for at least one example. */
"_FFR_MIME7TO8_OLD",
-#endif /* _FFR_MAX_SLEEP_TIME */
+#endif
#if _FFR_MORE_MACROS
/* allow more long macro names ("unprintable" characters). */
"_FFR_MORE_MACROS",
-#endif /* _FFR_MORE_MACROS */
+#endif
#if _FFR_MSG_ACCEPT
/* allow to override "Message accepted for delivery" */
"_FFR_MSG_ACCEPT",
-#endif /* _FFR_MSG_ACCEPT */
+#endif
#if _FFR_NODELAYDSN_ON_HOLD
/* Do not issue a DELAY DSN for mailers that use the hold flag. */
/* Steven Pitzl */
"_FFR_NODELAYDSN_ON_HOLD",
-#endif /* _FFR_NODELAYDSN_ON_HOLD */
+#endif
#if _FFR_NO_PIPE
/* Disable PIPELINING, delay client if used. */
"_FFR_NO_PIPE",
-#endif /* _FFR_NO_PIPE */
+#endif
#if _FFR_LDAP_NETWORK_TIMEOUT
/* set LDAP_OPT_NETWORK_TIMEOUT if available (-c) */
"_FFR_LDAP_NETWORK_TIMEOUT",
-#endif /* _FFR_LDAP_NETWORK_TIMEOUT */
+#endif
#if _FFR_LOG_NTRIES
/* log ntries=, from Nik Clayton of FreeBSD */
"_FFR_LOG_NTRIES",
-#endif /* _FFR_LOG_NTRIES */
+#endif
+#if _FFR_PROXY
+ /* "proxy" (synchronous) delivery mode */
+ "_FFR_PROXY",
+#endif
#if _FFR_QF_PARANOIA
"_FFR_QF_PARANOIA",
-#endif /* _FFR_QF_PARANOIA */
-#if _FFR_QUEUEDELAY
- /* Exponential queue delay; disabled in 8.13 since it isn't used. */
- "_FFR_QUEUEDELAY",
-#endif /* _FFR_QUEUEDELAY */
+#endif
#if _FFR_QUEUE_GROUP_SORTORDER
/* Allow QueueSortOrder per queue group. */
/* XXX: Still need to actually use qgrp->qg_sortorder */
"_FFR_QUEUE_GROUP_SORTORDER",
-#endif /* _FFR_QUEUE_GROUP_SORTORDER */
+#endif
#if _FFR_QUEUE_MACRO
/* Define {queue} macro. */
"_FFR_QUEUE_MACRO",
-#endif /* _FFR_QUEUE_MACRO */
+#endif
#if _FFR_QUEUE_RUN_PARANOIA
/* Additional checks when doing queue runs; interval of checks */
"_FFR_QUEUE_RUN_PARANOIA",
-#endif /* _FFR_QUEUE_RUN_PARANOIA */
+#endif
#if _FFR_QUEUE_SCHED_DBG
/* Debug output for the queue scheduler. */
"_FFR_QUEUE_SCHED_DBG",
-#endif /* _FFR_QUEUE_SCHED_DBG */
+#endif
+#if _FFR_RCPTFLAGS
+ "_FFR_RCPTFLAGS",
+#endif
#if _FFR_RCPTTHROTDELAY
/* configurable delay for BadRcptThrottle */
"_FFR_RCPTTHROTDELAY",
-#endif /* _FFR_RCPTTHROTDELAY */
+#endif
#if _FFR_REDIRECTEMPTY
/*
** envelope <> can't be sent to mailing lists, only owner-
@@ -6388,19 +6462,19 @@
*/
"_FFR_REDIRECTEMPTY",
-#endif /* _FFR_REDIRECTEMPTY */
+#endif
#if _FFR_REJECT_NUL_BYTE
/* reject NUL bytes in body */
"_FFR_REJECT_NUL_BYTE",
-#endif /* _FFR_REJECT_NUL_BYTE */
+#endif
#if _FFR_RESET_MACRO_GLOBALS
/* Allow macro 'j' to be set dynamically via rulesets. */
"_FFR_RESET_MACRO_GLOBALS",
-#endif /* _FFR_RESET_MACRO_GLOBALS */
+#endif
#if _FFR_RHS
/* Random shuffle for queue sorting. */
"_FFR_RHS",
-#endif /* _FFR_RHS */
+#endif
#if _FFR_RUNPQG
/*
** allow -qGqueue_group -qp to work, i.e.,
@@ -6408,15 +6482,15 @@
*/
"_FFR_RUNPQG",
-#endif /* _FFR_RUNPQG */
+#endif
#if _FFR_SESSID
/* session id (for logging) */
"_FFR_SESSID",
-#endif /* _FFR_SESSID */
+#endif
#if _FFR_SHM_STATUS
/* Donated code (unused). */
"_FFR_SHM_STATUS",
-#endif /* _FFR_SHM_STATUS */
+#endif
#if _FFR_LDAP_SINGLEDN
/*
** The LDAP database map code in Sendmail 8.12.10, when
@@ -6435,15 +6509,15 @@
*/
"_FFR_LDAP_SINGLEDN",
-#endif /* _FFR_LDAP_SINGLEDN */
+#endif
#if _FFR_SKIP_DOMAINS
/* process every N'th domain instead of every N'th message */
"_FFR_SKIP_DOMAINS",
-#endif /* _FFR_SKIP_DOMAINS */
+#endif
#if _FFR_SLEEP_USE_SELECT
/* Use select(2) in libsm/clock.c to emulate sleep(2) */
"_FFR_SLEEP_USE_SELECT ",
-#endif /* _FFR_SLEEP_USE_SELECT */
+#endif
#if _FFR_SPT_ALIGN
/*
** It looks like the Compaq Tru64 5.1A now aligns argv and envp to 64
@@ -6455,23 +6529,34 @@
/* Chris Adams of HiWAAY Informations Services */
"_FFR_SPT_ALIGN",
-#endif /* _FFR_SPT_ALIGN */
+#endif
#if _FFR_SS_PER_DAEMON
/* SuperSafe per DaemonPortOptions: 'T' (better letter?) */
"_FFR_SS_PER_DAEMON",
-#endif /* _FFR_SS_PER_DAEMON */
+#endif
#if _FFR_TESTS
/* enable some test code */
"_FFR_TESTS",
-#endif /* _FFR_TESTS */
+#endif
#if _FFR_TIMERS
/* Donated code (unused). */
"_FFR_TIMERS",
-#endif /* _FFR_TIMERS */
-#if _FFR_TLS_1
- /* More STARTTLS options, e.g., secondary certs. */
- "_FFR_TLS_1",
-#endif /* _FFR_TLS_1 */
+#endif
+#if _FFR_TLS_EC
+ "_FFR_TLS_EC",
+#endif
+#if _FFR_TLS_USE_CERTIFICATE_CHAIN_FILE
+ /*
+ ** Use SSL_CTX_use_certificate_chain_file()
+ ** instead of SSL_CTX_use_certificate_file()
+ */
+
+ "_FFR_TLS_USE_CERTIFICATE_CHAIN_FILE",
+#endif
+#if _FFR_TLS_SE_OPTS
+ /* TLS session options */
+ "_FFR_TLS_SE_OPTS",
+#endif
#if _FFR_TRUSTED_QF
/*
** If we don't own the file mark it as unsafe.
@@ -6480,15 +6565,28 @@
*/
"_FFR_TRUSTED_QF",
-#endif /* _FFR_TRUSTED_QF */
+#endif
+#if _FFR_USE_GETPWNAM_ERRNO
+ /*
+ ** See libsm/mbdb.c: only enable this on OSs
+ ** that implement the correct (POSIX) semantics.
+ ** This will need to become an OS-specific #if enabled
+ ** in one of the headers files under include/sm/os/ .
+ */
+
+ "_FFR_USE_GETPWNAM_ERRNO",
+#endif
#if _FFR_USE_SEM_LOCKING
"_FFR_USE_SEM_LOCKING",
-#endif /* _FFR_USE_SEM_LOCKING */
+#endif
#if _FFR_USE_SETLOGIN
/* Use setlogin() */
/* Peter Philipp */
"_FFR_USE_SETLOGIN",
-#endif /* _FFR_USE_SETLOGIN */
+#endif
+#if _FFR_XCNCT
+ "_FFR_XCNCT",
+#endif
NULL
};
Modified: stable/0.8/contrib/sendmail/src/conf.h
===================================================================
--- stable/0.8/contrib/sendmail/src/conf.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/conf.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2002 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -10,7 +10,7 @@
* the sendmail distribution.
*
*
- * $Id: conf.h,v 1.1.1.5 2010-01-10 20:14:37 laffer1 Exp $
+ * $Id: conf.h,v 8.577 2013-11-22 20:51:55 ca Exp $
*/
/*
@@ -112,7 +112,9 @@
#ifndef MAXHDRSLEN
# define MAXHDRSLEN (32 * 1024) /* max size of message headers */
#endif /* ! MAXHDRSLEN */
-#define MAXDAEMONS 10 /* max number of ports to listen to */
+#ifndef MAXDAEMONS
+# define MAXDAEMONS 10 /* max number of ports to listen to */
+#endif /* MAXDAEMONS */
#ifndef MAXINTERFACES
# define MAXINTERFACES 512 /* number of interfaces to probe */
#endif /* MAXINTERFACES */
Modified: stable/0.8/contrib/sendmail/src/control.c
===================================================================
--- stable/0.8/contrib/sendmail/src/control.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/control.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2004, 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2004, 2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: control.c,v 1.1.1.4 2013-08-14 22:35:48 laffer1 Exp $")
+SM_RCSID("@(#)$Id: control.c,v 8.130 2013-11-22 20:51:55 ca Exp $")
#include <sm/fdset.h>
Modified: stable/0.8/contrib/sendmail/src/convtime.c
===================================================================
--- stable/0.8/contrib/sendmail/src/convtime.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/convtime.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: convtime.c,v 1.1.1.2 2006-02-25 02:33:59 laffer1 Exp $")
+SM_RCSID("@(#)$Id: convtime.c,v 8.40 2013-11-22 20:51:55 ca Exp $")
/*
** CONVTIME -- convert time
Modified: stable/0.8/contrib/sendmail/src/daemon.c
===================================================================
--- stable/0.8/contrib/sendmail/src/daemon.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/daemon.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2007, 2009, 2010 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2007, 2009, 2010 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -14,7 +14,7 @@
#include <sendmail.h>
#include "map.h"
-SM_RCSID("@(#)$Id: daemon.c,v 1.1.1.8 2013-08-14 22:35:48 laffer1 Exp $")
+SM_RCSID("@(#)$Id: daemon.c,v 8.698 2013-11-22 20:51:55 ca Exp $")
#if defined(SOCK_STREAM) || defined(__GNU_LIBRARY__)
# define USE_SOCK_STREAM 1
@@ -32,7 +32,7 @@
#endif /* defined(USE_SOCK_STREAM) */
#if STARTTLS
-# include <openssl/rand.h>
+# include <openssl/rand.h>
#endif /* STARTTLS */
#include <sm/time.h>
@@ -517,14 +517,12 @@
macdefine(&BlankEnvelope.e_macro, A_PERM,
macid("{daemon_family}"), "unspec");
break;
-#if _FFR_DAEMON_NETUNIX
-# if NETUNIX
+#if NETUNIX
case AF_UNIX:
macdefine(&BlankEnvelope.e_macro, A_PERM,
macid("{daemon_family}"), "local");
break;
-# endif /* NETUNIX */
-#endif /* _FFR_DAEMON_NETUNIX */
+#endif /* NETUNIX */
#if NETINET
case AF_INET:
macdefine(&BlankEnvelope.e_macro, A_PERM,
@@ -827,7 +825,18 @@
OutChannel = outchannel;
DisConnected = false;
+#if _FFR_XCNCT
+ t = xconnect(inchannel);
+ if (t <= 0)
+ {
+ clrbitn(D_XCNCT, Daemons[curdaemon].d_flags);
+ clrbitn(D_XCNCT_M, Daemons[curdaemon].d_flags);
+ }
+ else
+ setbitn(t, Daemons[curdaemon].d_flags);
+#endif /* _FFR_XCNCT */
+
#if XLA
if (!xla_host_ok(RealHostName))
{
@@ -1060,8 +1069,7 @@
(void) sleep(5);
if (firsttime || d->d_socket < 0)
{
-#if _FFR_DAEMON_NETUNIX
-# if NETUNIX
+#if NETUNIX
if (d->d_addr.sa.sa_family == AF_UNIX)
{
int rval;
@@ -1084,8 +1092,7 @@
/* Don't try to overtake an existing socket */
(void) unlink(d->d_addr.sunix.sun_path);
}
-# endif /* NETUNIX */
-#endif /* _FFR_DOMAIN_NETUNIX */
+#endif /* NETUNIX */
d->d_socket = socket(d->d_addr.sa.sa_family,
SOCK_STREAM, 0);
if (d->d_socket < 0)
@@ -1113,7 +1120,7 @@
continue;
}
- if (SM_FD_SETSIZE > 0 && d->d_socket >= SM_FD_SETSIZE)
+ if (!SM_FD_OK_SELECT(d->d_socket))
{
save_errno = EINVAL;
syserr("opendaemonsocket: daemon %s: server SMTP socket (%d) too large",
@@ -1168,13 +1175,11 @@
switch (d->d_addr.sa.sa_family)
{
-#if _FFR_DAEMON_NETUNIX
-# ifdef NETUNIX
+#ifdef NETUNIX
case AF_UNIX:
socksize = sizeof(d->d_addr.sunix);
break;
-# endif /* NETUNIX */
-#endif /* _FFR_DAEMON_NETUNIX */
+#endif /* NETUNIX */
#if NETINET
case AF_INET:
socksize = sizeof(d->d_addr.sin);
@@ -1493,6 +1498,9 @@
case SM_DEFER:
case SM_DELIVER:
case SM_FORK:
+#if _FFR_PROXY
+ case SM_PROXY_REQ:
+#endif /* _FFR_PROXY */
d->d_dm = *v;
break;
default:
@@ -1512,13 +1520,11 @@
#endif /* !_FFR_DPO_CS */
if (isascii(*v) && isdigit(*v))
d->d_addr.sa.sa_family = atoi(v);
-#if _FFR_DAEMON_NETUNIX
-# ifdef NETUNIX
+#ifdef NETUNIX
else if (sm_strcasecmp(v, "unix") == 0 ||
sm_strcasecmp(v, "local") == 0)
d->d_addr.sa.sa_family = AF_UNIX;
-# endif /* NETUNIX */
-#endif /* _FFR_DAEMON_NETUNIX */
+#endif /* NETUNIX */
#if NETINET
else if (sm_strcasecmp(v, "inet") == 0)
d->d_addr.sa.sa_family = AF_INET;
@@ -1628,14 +1634,14 @@
{
switch (d->d_addr.sa.sa_family)
{
-#if _FFR_DAEMON_NETUNIX
-# if NETUNIX
+#if NETUNIX
case AF_UNIX:
if (strlen(addr) >= sizeof(d->d_addr.sunix.sun_path))
{
errno = ENAMETOOLONG;
- syserr("setsockaddroptions: domain socket name too long: %s > %d",
- addr, sizeof(d->d_addr.sunix.sun_path));
+ syserr("setsockaddroptions: domain socket name too long: %s > %ld",
+ addr,
+ (long) sizeof(d->d_addr.sunix.sun_path));
break;
}
@@ -1646,8 +1652,7 @@
addr,
sizeof(d->d_addr.sunix.sun_path));
break;
-# endif /* NETUNIX */
-#endif /* _FFR_DAEMON_NETUNIX */
+#endif /* NETUNIX */
#if NETINET
case AF_INET:
if (!isascii(*addr) || !isdigit(*addr) ||
@@ -1998,8 +2003,7 @@
return AF_INET6;
}
#endif /* NETINET6 */
-#if _FFR_DAEMON_NETUNIX
-# if NETUNIX
+#if NETUNIX
if (*addr == '/')
{
if (tTd(16, 9))
@@ -2006,8 +2010,7 @@
sm_dprintf("addr_family(%s): LOCAL\n", addr);
return AF_UNIX;
}
-# endif /* NETUNIX */
-#endif /* _FFR_DAEMON_NETUNIX */
+#endif /* NETUNIX */
if (tTd(16, 9))
sm_dprintf("addr_family(%s): UNSPEC\n", addr);
return AF_UNSPEC;
@@ -2045,7 +2048,7 @@
#if MILTER
/*
-** SETUP_DAEMON_FILTERS -- Parse per-socket filters
+** SETUP_DAEMON_MILTERS -- Parse per-socket filters
**
** Parameters:
** none
@@ -2352,11 +2355,11 @@
/* check for name server timeouts */
# if NETINET6
if (WorkAroundBrokenAAAA && family == AF_INET6 &&
- errno == ETIMEDOUT)
+ (h_errno == TRY_AGAIN || errno == ETIMEDOUT))
{
/*
** An attempt with family AF_INET may
- ** succeed By skipping the next section
+ ** succeed. By skipping the next section
** of code, we will try AF_INET before
** failing.
*/
@@ -3047,8 +3050,7 @@
(void) close(Daemons[i].d_socket);
Daemons[i].d_socket = -1;
-#if _FFR_DAEMON_NETUNIX
-# if NETUNIX
+#if NETUNIX
/* Remove named sockets */
if (Daemons[i].d_addr.sa.sa_family == AF_UNIX)
{
@@ -3070,8 +3072,7 @@
sm_errstring(errno));
}
}
-# endif /* NETUNIX */
-#endif /* _FFR_DAEMON_NETUNIX */
+#endif /* NETUNIX */
}
}
@@ -3413,7 +3414,7 @@
char ibuf[MAXNAME + 1];
static char hbuf[MAXNAME + MAXAUTHINFO + 11];
- *may_be_forged = false;
+ *may_be_forged = true;
falen = sizeof(RealHostAddr);
if (isatty(fd) || (i = getpeername(fd, &RealHostAddr.sa, &falen)) < 0 ||
falen <= 0 || RealHostAddr.sa.sa_family == 0)
@@ -3430,6 +3431,8 @@
return NULL;
errno = 0;
}
+
+ *may_be_forged = false;
(void) sm_strlcpyn(hbuf, sizeof(hbuf), 2, RealUserName,
"@localhost");
if (tTd(9, 1))
@@ -3446,8 +3449,10 @@
}
/* cross check RealHostName with forward DNS lookup */
- if (anynet_ntoa(&RealHostAddr)[0] != '[' &&
- RealHostName[0] != '[')
+ if (anynet_ntoa(&RealHostAddr)[0] == '[' ||
+ RealHostName[0] == '[')
+ *may_be_forged = false;
+ else
{
int family;
@@ -3473,19 +3478,16 @@
/* try to match the reverse against the forward lookup */
hp = sm_gethostbyname(RealHostName, family);
- if (hp == NULL)
+ if (hp != NULL)
{
- /* XXX: Could be a temporary error on forward lookup */
- *may_be_forged = true;
- }
- else
- {
for (ha = hp->h_addr_list; *ha != NULL; ha++)
{
if (addrcmp(hp, *ha, &RealHostAddr) == 0)
+ {
+ *may_be_forged = false;
break;
+ }
}
- *may_be_forged = *ha == NULL;
#if NETINET6
freehostent(hp);
hp = NULL;
@@ -4259,8 +4261,10 @@
return NULL;
dst += sz;
dst_len -= sz;
- ap = (char *) inet_ntop(AF_INET6, s6a, dst, dst_len);
-
+ if (UseCompressedIPv6Addresses)
+ ap = (char *) inet_ntop(AF_INET6, s6a, dst, dst_len);
+ else
+ ap = sm_inet6_ntop(s6a, dst, dst_len);
/* Restore pointer to beginning of string */
if (ap != NULL)
ap = d;
Modified: stable/0.8/contrib/sendmail/src/daemon.h
===================================================================
--- stable/0.8/contrib/sendmail/src/daemon.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/daemon.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: daemon.h,v 1.1.1.1 2007-11-23 22:10:30 laffer1 Exp $
+ * $Id: daemon.h,v 8.4 2013-11-22 20:51:55 ca Exp $
*/
#ifndef DAEMON_H
Modified: stable/0.8/contrib/sendmail/src/deliver.c
===================================================================
--- stable/0.8/contrib/sendmail/src/deliver.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/deliver.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2010, 2012 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2010, 2012 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -14,7 +14,7 @@
#include <sendmail.h>
#include <sm/time.h>
-SM_RCSID("@(#)$Id: deliver.c,v 1.1.1.7 2013-08-14 22:35:48 laffer1 Exp $")
+SM_RCSID("@(#)$Id: deliver.c,v 8.1030 2013-11-22 20:51:55 ca Exp $")
#if HASSETUSERCONTEXT
# include <login_cap.h>
@@ -37,7 +37,7 @@
static int coloncmp __P((const char *, const char *));
#if STARTTLS
-# include <openssl/err.h>
+# include <openssl/err.h>
static int starttls __P((MAILER *, MCI *, ENVELOPE *));
static int endtlsclt __P((MCI *));
#endif /* STARTTLS */
@@ -1223,6 +1223,7 @@
}
return false;
}
+
/*
** DELIVER -- Deliver a message to a list of addresses.
**
@@ -1392,6 +1393,8 @@
else
p = e->e_from.q_paddr;
rpath = remotename(p, m, RF_SENDERADDR|RF_CANONICAL, &rcode, e);
+ if (rcode != EX_OK && bitnset(M_xSMTP, m->m_flags))
+ goto cleanup;
if (strlen(rpath) > MAXNAME)
{
rpath = shortenstring(rpath, MAXSHORTSTR);
@@ -1468,6 +1471,7 @@
/* running LMTP or SMTP */
clever = true;
*pvp = NULL;
+ setbitn(M_xSMTP, m->m_flags);
}
else if (bitnset(M_LMTP, m->m_flags))
{
@@ -1600,7 +1604,7 @@
quarantine = (e->e_quarmsg != NULL);
rcode = rscheck("check_compat", e->e_from.q_paddr, to->q_paddr,
e, RSF_RMCOMM|RSF_COUNT, 3, NULL,
- e->e_id, NULL);
+ e->e_id, NULL, NULL);
if (rcode == EX_OK)
{
/* do in-code checking if not discarding */
@@ -2417,6 +2421,12 @@
else
pwd = sm_getpwnam(contextaddr->q_user);
sucflags = LOGIN_SETRESOURCES|LOGIN_SETPRIORITY;
+#ifdef LOGIN_SETCPUMASK
+ sucflags |= LOGIN_SETCPUMASK;
+#endif /* LOGIN_SETCPUMASK */
+#ifdef LOGIN_SETLOGINCLASS
+ sucflags |= LOGIN_SETLOGINCLASS;
+#endif /* LOGIN_SETLOGINCLASS */
#ifdef LOGIN_SETMAC
sucflags |= LOGIN_SETMAC;
#endif /* LOGIN_SETMAC */
@@ -2459,8 +2469,8 @@
ctladdr->q_gid) == -1
&& suidwarn)
{
- syserr("openmailer: initgroups(%s, %d) failed",
- user, ctladdr->q_gid);
+ syserr("openmailer: initgroups(%s, %ld) failed",
+ user, (long) ctladdr->q_gid);
exit(EX_TEMPFAIL);
}
}
@@ -2486,8 +2496,8 @@
if (initgroups(DefUser, DefGid) == -1 &&
suidwarn)
{
- syserr("openmailer: initgroups(%s, %d) failed",
- DefUser, DefGid);
+ syserr("openmailer: initgroups(%s, %ld) failed",
+ DefUser, (long) DefGid);
exit(EX_TEMPFAIL);
}
}
@@ -2516,9 +2526,9 @@
new_gid != getegid())
{
/* Only root can change the gid */
- syserr("openmailer: insufficient privileges to change gid, RunAsUid=%d, new_gid=%d, gid=%d, egid=%d",
- (int) RunAsUid, (int) new_gid,
- (int) getgid(), (int) getegid());
+ syserr("openmailer: insufficient privileges to change gid, RunAsUid=%ld, new_gid=%ld, gid=%ld, egid=%ld",
+ (long) RunAsUid, (long) new_gid,
+ (long) getgid(), (long) getegid());
exit(EX_TEMPFAIL);
}
@@ -2613,8 +2623,8 @@
if (RunAsUid != 0 && new_euid != RunAsUid)
{
/* Only root can change the uid */
- syserr("openmailer: insufficient privileges to change uid, new_euid=%d, RunAsUid=%d",
- (int) new_euid, (int) RunAsUid);
+ syserr("openmailer: insufficient privileges to change uid, new_euid=%ld, RunAsUid=%ld",
+ (long) new_euid, (long) RunAsUid);
exit(EX_TEMPFAIL);
}
@@ -2656,9 +2666,9 @@
}
if (tTd(11, 2))
- sm_dprintf("openmailer: running as r/euid=%d/%d, r/egid=%d/%d\n",
- (int) getuid(), (int) geteuid(),
- (int) getgid(), (int) getegid());
+ sm_dprintf("openmailer: running as r/euid=%ld/%ld, r/egid=%ld/%ld\n",
+ (long) getuid(), (long) geteuid(),
+ (long) getgid(), (long) getegid());
/* move into some "safe" directory */
if (m->m_execdir != NULL)
@@ -2958,8 +2968,8 @@
QuickAbort = false;
SuprErrs = true;
if (rscheck("try_tls", host, NULL, e,
- RSF_RMCOMM, 7, host, NOQID, NULL)
- != EX_OK
+ RSF_RMCOMM, 7, host, NOQID, NULL,
+ NULL) != EX_OK
|| Errors > olderrors)
{
usetls = false;
@@ -3033,7 +3043,7 @@
if (rscheck("tls_server",
macvalue(macid("{verify}"), e),
NULL, e, RSF_RMCOMM|RSF_COUNT, 5,
- host, NOQID, NULL) != EX_OK ||
+ host, NOQID, NULL, NULL) != EX_OK ||
Errors > olderrors ||
rcode == EX_SOFTWARE)
{
@@ -3358,7 +3368,7 @@
# if STARTTLS
i = rscheck("tls_rcpt", to->q_user, NULL, e,
RSF_RMCOMM|RSF_COUNT, 3,
- mci->mci_host, e->e_id, NULL);
+ mci->mci_host, e->e_id, NULL, NULL);
if (i != EX_OK)
{
markfailure(e, to, mci, i, false);
@@ -3584,7 +3594,7 @@
if (tobuf[0] != '\0')
{
- giveresponse(rcode, NULL, m, mci, ctladdr, xstart, e, tochain);
+ giveresponse(rcode, NULL, m, mci, ctladdr, xstart, e, NULL);
#if 0
/*
** This code is disabled for now because I am not
@@ -4160,14 +4170,13 @@
/*
** Final cleanup.
- ** Log a record of the transaction. Compute the new
- ** ExitStat -- if we already had an error, stick with
- ** that.
+ ** Log a record of the transaction. Compute the new ExitStat
+ ** -- if we already had an error, stick with that.
*/
if (OpMode != MD_VERIFY && !bitset(EF_VRFYONLY, e->e_flags) &&
LogLevel > ((status == EX_TEMPFAIL) ? 8 : (status == EX_OK) ? 7 : 6))
- logdelivery(m, mci, dsn, statmsg + off, ctladdr, xstart, e);
+ logdelivery(m, mci, dsn, statmsg + off, ctladdr, xstart, e, to, status);
if (tTd(11, 2))
sm_dprintf("giveresponse: status=%d, dsn=%s, e->e_message=%s, errnum=%d\n",
@@ -4209,6 +4218,8 @@
** xstart -- the transaction start time, used for
** computing transaction delay.
** e -- the current envelope.
+** to -- the current recipient (NULL if none).
+** rcode -- status code
**
** Returns:
** none
@@ -4218,7 +4229,7 @@
*/
void
-logdelivery(m, mci, dsn, status, ctladdr, xstart, e)
+logdelivery(m, mci, dsn, status, ctladdr, xstart, e, to, rcode)
MAILER *m;
register MCI *mci;
char *dsn;
@@ -4226,6 +4237,8 @@
ADDRESS *ctladdr;
time_t xstart;
register ENVELOPE *e;
+ ADDRESS *to;
+ int rcode;
{
register char *bp;
register char *p;
@@ -4270,6 +4283,16 @@
bp += strlen(bp);
}
+# if _FFR_LOG_MORE2
+# if STARTTLS
+ p = macvalue(macid("{verify}"), e);
+ if (p == NULL || *p == '\0')
+ p = "NONE";
+ (void) sm_snprintf(bp, SPACELEFT(buf, bp), ", tls_verify=%.20s", p);
+ bp += strlen(bp);
+# endif /* STARTTLS */
+# endif /* _FFR_LOG_MORE2 */
+
/* pri: changes with each delivery attempt */
(void) sm_snprintf(bp, SPACELEFT(buf, bp), ", pri=%ld",
PRT_NONNEGL(e->e_msgpriority));
@@ -4336,6 +4359,43 @@
# define STATLEN 203
# endif /* (STATLEN) > 203 */
+#if _FFR_LOGREPLY
+ /*
+ ** Notes:
+ ** per-rcpt status: to->q_rstatus
+ ** global status: e->e_text
+ **
+ ** We (re)use STATLEN here, is that a good choice?
+ **
+ ** stat=Deferred: ...
+ ** has sometimes the same text?
+ **
+ ** Note: this doesn't show the stage at which the error happened.
+ ** can/should we log that?
+ ** XS_* in reply() basically encodes the state.
+ */
+
+ /* only show errors */
+ if (rcode != EX_OK && to != NULL && to->q_rstatus != NULL &&
+ *to->q_rstatus != '\0')
+ {
+ (void) sm_snprintf(bp, SPACELEFT(buf, bp),
+ ", reply=%s",
+ shortenstring(to->q_rstatus, STATLEN));
+ bp += strlen(bp);
+ }
+ else if (rcode != EX_OK && e->e_text != NULL)
+ {
+ (void) sm_snprintf(bp, SPACELEFT(buf, bp),
+ ", reply=%d %s%s%s",
+ e->e_rcode,
+ e->e_renhsc,
+ (e->e_renhsc[0] != '\0') ? " " : "",
+ shortenstring(e->e_text, STATLEN));
+ bp += strlen(bp);
+ }
+#endif
+
/* stat: max 210 bytes */
if ((bp - buf) > (sizeof(buf) - ((STATLEN) + 20)))
{
@@ -4362,6 +4422,7 @@
for (q = p + l; q > p; q--)
{
+ /* XXX a comma in an address will break this! */
if (*q == ',')
break;
}
@@ -5321,8 +5382,8 @@
if (RunAsUid != 0 && RealUid != RunAsUid)
{
/* Only root can change the uid */
- syserr("mailfile: insufficient privileges to change uid, RunAsUid=%d, RealUid=%d",
- (int) RunAsUid, (int) RealUid);
+ syserr("mailfile: insufficient privileges to change uid, RunAsUid=%ld, RealUid=%ld",
+ (long) RunAsUid, (long) RealUid);
RETURN(EX_TEMPFAIL);
}
}
@@ -5362,9 +5423,9 @@
RealGid != getegid()))
{
/* Only root can change the gid */
- syserr("mailfile: insufficient privileges to change gid, RealGid=%d, RunAsUid=%d, gid=%d, egid=%d",
- (int) RealGid, (int) RunAsUid,
- (int) getgid(), (int) getegid());
+ syserr("mailfile: insufficient privileges to change gid, RealGid=%ld, RunAsUid=%ld, gid=%ld, egid=%ld",
+ (long) RealGid, (long) RunAsUid,
+ (long) getgid(), (long) getegid());
RETURN(EX_TEMPFAIL);
}
}
@@ -5405,8 +5466,8 @@
{
if (initgroups(RealUserName, RealGid) == -1 && suidwarn)
{
- syserr("mailfile: initgroups(%s, %d) failed",
- RealUserName, RealGid);
+ syserr("mailfile: initgroups(%s, %ld) failed",
+ RealUserName, (long) RealGid);
RETURN(EX_TEMPFAIL);
}
}
@@ -5468,9 +5529,9 @@
}
if (tTd(11, 2))
- sm_dprintf("mailfile: running as r/euid=%d/%d, r/egid=%d/%d\n",
- (int) getuid(), (int) geteuid(),
- (int) getgid(), (int) getegid());
+ sm_dprintf("mailfile: running as r/euid=%ld/%ld, r/egid=%ld/%ld\n",
+ (long) getuid(), (long) geteuid(),
+ (long) getgid(), (long) getegid());
/* move into some "safe" directory */
@@ -6157,11 +6218,18 @@
}
return EX_SOFTWARE;
}
+ /* SSL_clear(clt_ssl); ? */
+ if (get_tls_se_options(e, clt_ssl, false) != 0)
+ {
+ sm_syslog(LOG_ERR, NOQID,
+ "STARTTLS=client, get_tls_se_options=fail");
+ return EX_SOFTWARE;
+ }
+
rfd = sm_io_getinfo(mci->mci_in, SM_IO_WHAT_FD, NULL);
wfd = sm_io_getinfo(mci->mci_out, SM_IO_WHAT_FD, NULL);
- /* SSL_clear(clt_ssl); ? */
if (rfd < 0 || wfd < 0 ||
(result = SSL_set_rfd(clt_ssl, rfd)) != 1 ||
(result = SSL_set_wfd(clt_ssl, wfd)) != 1)
@@ -6183,6 +6251,7 @@
if ((result = SSL_connect(clt_ssl)) <= 0)
{
int i, ssl_err;
+ int save_errno = errno;
ssl_err = SSL_get_error(clt_ssl, result);
i = tls_retry(clt_ssl, rfd, wfd, tlsstart,
@@ -6200,7 +6269,7 @@
sm_syslog(LOG_WARNING, NOQID,
"STARTTLS=client, error: connect failed=%d, reason=%s, SSL_error=%d, errno=%d, retry=%d",
result, sr == NULL ? "unknown" : sr, ssl_err,
- errno, i);
+ save_errno, i);
if (LogLevel > 9)
tlslogerr(LOG_WARNING, "client");
}
Modified: stable/0.8/contrib/sendmail/src/domain.c
===================================================================
--- stable/0.8/contrib/sendmail/src/domain.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/domain.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2004, 2006, 2010 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2004, 2006, 2010 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1986, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -15,9 +15,9 @@
#include "map.h"
#if NAMED_BIND
-SM_RCSID("@(#)$Id: domain.c,v 1.1.1.5 2011-05-17 22:19:51 laffer1 Exp $ (with name server)")
+SM_RCSID("@(#)$Id: domain.c,v 8.205 2013-11-22 20:51:55 ca Exp $ (with name server)")
#else /* NAMED_BIND */
-SM_RCSID("@(#)$Id: domain.c,v 1.1.1.5 2011-05-17 22:19:51 laffer1 Exp $ (without name server)")
+SM_RCSID("@(#)$Id: domain.c,v 8.205 2013-11-22 20:51:55 ca Exp $ (without name server)")
#endif /* NAMED_BIND */
#if NAMED_BIND
Modified: stable/0.8/contrib/sendmail/src/envelope.c
===================================================================
--- stable/0.8/contrib/sendmail/src/envelope.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/envelope.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2003, 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2003, 2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: envelope.c,v 1.1.1.7 2011-05-17 22:19:51 laffer1 Exp $")
+SM_RCSID("@(#)$Id: envelope.c,v 8.313 2013-11-22 20:51:55 ca Exp $")
/*
** CLRSESSENVELOPE -- clear session oriented data in an envelope
@@ -42,11 +42,9 @@
macdefine(&e->e_macro, A_PERM, macid("{cipher}"), "");
macdefine(&e->e_macro, A_PERM, macid("{tls_version}"), "");
macdefine(&e->e_macro, A_PERM, macid("{verify}"), "");
-# if _FFR_TLS_1
macdefine(&e->e_macro, A_PERM, macid("{alg_bits}"), "");
macdefine(&e->e_macro, A_PERM, macid("{cn_issuer}"), "");
macdefine(&e->e_macro, A_PERM, macid("{cn_subject}"), "");
-# endif /* _FFR_TLS_1 */
#endif /* STARTTLS */
}
@@ -246,6 +244,16 @@
e->e_flags |= EF_FATALERRS|EF_CLRQUEUE;
}
+#if _FFR_PROXY
+ if (tTd(87, 2))
+ {
+ q = e->e_sendqueue;
+ sm_dprintf("dropenvelope: mode=%c, e=%p, sibling=%p, nrcpts=%d, sendqueue=%p, next=%p, state=%d\n",
+ e->e_sendmode, e, e->e_sibling, e->e_nrcpts, q,
+ (q == NULL) ? (void *)0 : q->q_next,
+ (q == NULL) ? -1 : q->q_state);
+ }
+#endif /* _FFR_PROXY */
e->e_flags &= ~EF_QUEUERUN;
for (q = e->e_sendqueue; q != NULL; q = q->q_next)
@@ -253,6 +261,10 @@
if (QS_IS_UNDELIVERED(q->q_state))
queueit = true;
+#if _FFR_PROXY
+ if (queueit && e->e_sendmode == SM_PROXY)
+ queueit = false;
+#endif /* _FFR_PROXY */
/* see if a notification is needed */
if (bitset(QPINGONFAILURE, q->q_flags) &&
@@ -577,9 +589,9 @@
if (!split_by_recipient(e) &&
bitset(EF_FATALERRS, e->e_flags))
{
- syserr("!dropenvelope(%s): cannot commit data file %s, uid=%d",
+ syserr("!dropenvelope(%s): cannot commit data file %s, uid=%ld",
e->e_id, queuename(e, DATAFL_LETTER),
- (int) geteuid());
+ (long) geteuid());
}
for (ee = e->e_sibling; ee != NULL; ee = ee->e_sibling)
queueup(ee, false, true);
Modified: stable/0.8/contrib/sendmail/src/err.c
===================================================================
--- stable/0.8/contrib/sendmail/src/err.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/err.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2003, 2010 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2003, 2010 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: err.c,v 1.1.1.4 2011-05-17 22:19:51 laffer1 Exp $")
+SM_RCSID("@(#)$Id: err.c,v 8.206 2013-11-22 20:51:55 ca Exp $")
#if LDAPMAP
# include <lber.h>
@@ -94,7 +94,7 @@
** reply code defaults to 451 or 554, depending on errno.
**
** Parameters:
-** fmt -- the format string. An optional '!' or '@',
+** fmt -- the format string. An optional '!', '@', or '+',
** followed by an optional three-digit SMTP
** reply code, followed by message text.
** (others) -- parameters
@@ -127,8 +127,7 @@
{
register char *p;
int save_errno = errno;
- bool panic;
- bool exiting;
+ bool panic, exiting, keep;
char *user;
char *enhsc;
char *errtxt;
@@ -136,21 +135,22 @@
char ubuf[80];
SM_VA_LOCAL_DECL
+ panic = exiting = keep = false;
switch (*fmt)
{
case '!':
++fmt;
- panic = true;
- exiting = true;
+ panic = exiting = true;
break;
case '@':
++fmt;
- panic = false;
exiting = true;
break;
+ case '+':
+ ++fmt;
+ keep = true;
+ break;
default:
- panic = false;
- exiting = false;
break;
}
@@ -182,7 +182,7 @@
puterrmsg(MsgBuf);
/* save this message for mailq printing */
- if (!panic && CurEnv != NULL)
+ if (!panic && CurEnv != NULL && (!keep || CurEnv->e_message == NULL))
{
char *nmsg = sm_rpool_strdup_x(CurEnv->e_rpool, errtxt);
@@ -479,8 +479,110 @@
}
}
+#if _FFR_PROXY
+/*
+** EMESSAGE -- print message (not necessarily an error)
+** (same as message() but requires reply code and enhanced status code)
+**
+** Parameters:
+** replycode -- SMTP reply code.
+** enhsc -- enhanced status code.
+** msg -- the message (sm_io_printf fmt) -- it can begin with
+** an SMTP reply code. If not, 050 is assumed.
+** (others) -- sm_io_printf arguments
+**
+** Returns:
+** none
+**
+** Side Effects:
+** none.
+*/
+/*VARARGS3*/
+void
+# ifdef __STDC__
+emessage(const char *replycode, const char *enhsc, const char *msg, ...)
+# else /* __STDC__ */
+emessage(replycode, enhsc, msg, va_alist)
+ const char *replycode;
+ const char *enhsc;
+ const char *msg;
+ va_dcl
+# endif /* __STDC__ */
+{
+ char *errtxt;
+ SM_VA_LOCAL_DECL
+
+ errno = 0;
+ SM_VA_START(ap, msg);
+ errtxt = fmtmsg(MsgBuf, CurEnv->e_to, replycode, enhsc, 0, msg, ap);
+ SM_VA_END(ap);
+ putoutmsg(MsgBuf, false, false);
+
+ /* save this message for mailq printing */
+ switch (MsgBuf[0])
+ {
+ case '4':
+ case '8':
+ if (CurEnv->e_message != NULL)
+ break;
+ /* FALLTHROUGH */
+
+ case '5':
+ if (CurEnv->e_rpool == NULL && CurEnv->e_message != NULL)
+ sm_free(CurEnv->e_message);
+ CurEnv->e_message = sm_rpool_strdup_x(CurEnv->e_rpool, errtxt);
+ break;
+ }
+}
+
/*
+** EXTSC -- check and extract a status codes
+**
+** Parameters:
+** msg -- string with possible enhanced status code.
+** delim -- delim for enhanced status code.
+** replycode -- pointer to storage for SMTP reply code;
+** must be != NULL and have space for at least
+** 4 characters.
+** enhsc -- pointer to storage for enhanced status code;
+** must be != NULL and have space for at least
+** 10 characters ([245].[0-9]{1,3}.[0-9]{1,3})
+**
+** Returns:
+** -1 -- no SMTP reply code.
+** >=3 -- offset of error text in msg.
+** (<=4 -- no enhanced status code)
+*/
+
+int
+extsc(msg, delim, replycode, enhsc)
+ const char *msg;
+ int delim;
+ char *replycode;
+ char *enhsc;
+{
+ int offset;
+
+ SM_REQUIRE(replycode != NULL);
+ SM_REQUIRE(enhsc != NULL);
+ replycode[0] = '\0';
+ enhsc[0] = '\0';
+ if (msg == NULL)
+ return -1;
+ if (!ISSMTPREPLY(msg))
+ return -1;
+ sm_strlcpy(replycode, msg, 4);
+ if (msg[3] == '\0')
+ return 3;
+ offset = 4;
+ if (isenhsc(msg + 4, delim))
+ offset = extenhsc(msg + 4, delim, enhsc) + 4;
+ return offset;
+}
+#endif /* _FFR_PROXY */
+
+/*
** NMESSAGE -- print message (not necessarily an error)
**
** Just like "message" except it never puts the to... tag on.
@@ -1138,7 +1240,7 @@
}
#if LDAPMAP
- if (errnum >= E_LDAPBASE)
+ if (errnum >= E_LDAPBASE - E_LDAP_SHIM)
return ldap_err2string(errnum - E_LDAPBASE);
#endif /* LDAPMAP */
Modified: stable/0.8/contrib/sendmail/src/headers.c
===================================================================
--- stable/0.8/contrib/sendmail/src/headers.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/headers.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2004, 2006, 2007 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2004, 2006, 2007 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -14,7 +14,7 @@
#include <sendmail.h>
#include <sm/sendmail.h>
-SM_RCSID("@(#)$Id: headers.c,v 1.1.1.6 2013-08-14 22:35:48 laffer1 Exp $")
+SM_RCSID("@(#)$Id: headers.c,v 8.320 2013-11-22 20:51:55 ca Exp $")
static HDR *allocheader __P((char *, char *, int, SM_RPOOL_T *, bool));
static size_t fix_mime_header __P((HDR *, ENVELOPE *));
@@ -360,7 +360,7 @@
macdefine(&e->e_macro, A_PERM,
macid("{addr_type}"), "h");
(void) rscheck(rs, fvalue, NULL, e, rscheckflags, 3,
- NULL, e->e_id, NULL);
+ NULL, e->e_id, NULL, NULL);
}
}
@@ -377,11 +377,6 @@
if (!bitset(pflag, CHHDR_DEF) && !headeronly &&
!bitset(EF_QUEUERUN, e->e_flags) && sm_strcasecmp(fname, p) == 0)
{
- if (tTd(31, 2))
- {
- sm_dprintf("comparing header from (%s) against default (%s or %s)\n",
- fvalue, e->e_from.q_paddr, e->e_from.q_user);
- }
if (e->e_from.q_paddr != NULL &&
e->e_from.q_mailer != NULL &&
bitnset(M_LOCALMAILER, e->e_from.q_mailer->m_flags) &&
@@ -388,6 +383,12 @@
(strcmp(fvalue, e->e_from.q_paddr) == 0 ||
strcmp(fvalue, e->e_from.q_user) == 0))
dropfrom = true;
+ if (tTd(31, 2))
+ {
+ sm_dprintf("comparing header from (%s) against default (%s or %s), drop=%d\n",
+ fvalue, e->e_from.q_paddr, e->e_from.q_user,
+ dropfrom);
+ }
}
/* delete default value for this header */
@@ -406,6 +407,19 @@
{
/* make this look like the user entered it */
h->h_flags |= H_USER;
+
+ /*
+ ** If the MH hack is selected, allow to turn
+ ** it off via a mailer flag to avoid problems
+ ** with setups that remove the F flag from
+ ** the RCPT mailer.
+ */
+
+ if (bitnset(M_NOMHHACK,
+ e->e_from.q_mailer->m_flags))
+ {
+ h->h_flags &= ~H_CHECK;
+ }
return hi->hi_flags;
}
h->h_value = NULL;
@@ -1180,6 +1194,22 @@
", daemon=%.20s", p);
sbp += strlen(sbp);
}
+# if _FFR_LOG_MORE1
+# if STARTTLS
+ p = macvalue(macid("{verify}"), e);
+ if (p == NULL || *p == '\0')
+ p = "NONE";
+ (void) sm_snprintf(sbp, SPACELEFT(sbuf, sbp), ", tls_verify=%.20s", p);
+ sbp += strlen(sbp);
+# endif /* STARTTLS */
+# if SASL
+ p = macvalue(macid("{auth_type}"), e);
+ if (p == NULL || *p == '\0')
+ p = "NONE";
+ (void) sm_snprintf(sbp, SPACELEFT(sbuf, sbp), ", auth=%.20s", p);
+ sbp += strlen(sbp);
+# endif /* SASL */
+# endif /* _FFR_LOG_MORE1 */
sm_syslog(LOG_INFO, e->e_id, "%.850s, relay=%s", sbuf, name);
#else /* (SYSLOG_BUFSIZE) >= 256 */
@@ -1878,8 +1908,10 @@
if (bitset(H_FROM, h->h_flags))
oldstyle = false;
- commaize(h, p, oldstyle, mci, e,
- PXLF_HEADER | PXLF_STRIPMQUOTE);
+ if (!commaize(h, p, oldstyle, mci, e,
+ PXLF_HEADER | PXLF_STRIPMQUOTE)
+ && bitnset(M_xSMTP, mci->mci_mailer->m_flags))
+ goto writeerr;
}
else
{
@@ -2155,6 +2187,12 @@
#endif /* USERDB */
status = EX_OK;
name = remotename(name, mci->mci_mailer, flags, &status, e);
+ if (status != EX_OK && bitnset(M_xSMTP, mci->mci_mailer->m_flags))
+ {
+ if (status == EX_TEMPFAIL)
+ mci->mci_flags |= MCIF_NOTSTICKY;
+ goto writeerr;
+ }
if (*name == '\0')
{
*p = savechar;
Modified: stable/0.8/contrib/sendmail/src/helpfile
===================================================================
--- stable/0.8/contrib/sendmail/src/helpfile 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/helpfile 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,6 +1,6 @@
#vers 2
cpyr
-cpyr Copyright (c) 1998-2000, 2002, 2004-2007 Sendmail, Inc. and its suppliers.
+cpyr Copyright (c) 1998-2000, 2002, 2004-2007 Proofpoint, Inc. and its suppliers.
cpyr All rights reserved.
cpyr Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
cpyr Copyright (c) 1988, 1993
@@ -11,7 +11,7 @@
cpyr forth in the LICENSE file which can be found at the top level of
cpyr the sendmail distribution.
cpyr
-cpyr $$Id: helpfile,v 1.1.1.4 2007-11-23 22:10:30 laffer1 Exp $$
+cpyr $$Id: helpfile,v 8.49 2013-11-22 20:51:55 ca Exp $$
cpyr
smtp This is sendmail version $v
smtp Topics:
Modified: stable/0.8/contrib/sendmail/src/macro.c
===================================================================
--- stable/0.8/contrib/sendmail/src/macro.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/macro.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2001, 2003, 2006, 2007 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2001, 2003, 2006, 2007 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: macro.c,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $")
+SM_RCSID("@(#)$Id: macro.c,v 8.108 2013-11-22 20:51:55 ca Exp $")
#include <sm/sendmail.h>
#if MAXMACROID != (BITMAPBITS - 1)
Copied: stable/0.8/contrib/sendmail/src/mailq.0 (from rev 9097, trunk/contrib/sendmail/src/mailq.0)
===================================================================
--- stable/0.8/contrib/sendmail/src/mailq.0 (rev 0)
+++ stable/0.8/contrib/sendmail/src/mailq.0 2016-10-01 17:46:48 UTC (rev 9102)
@@ -0,0 +1,81 @@
+MAILQ(1) MAILQ(1)
+
+
+
+NNAAMMEE
+ mailq - print the mail queue
+
+SSYYNNOOPPSSIISS
+ mmaaiillqq [--AAcc] [--qq......] [--vv]
+
+DDEESSCCRRIIPPTTIIOONN
+ MMaaiillqq prints a summary of the mail messages queued for future delivery.
+
+ The first line printed for each message shows the internal identifier
+ used on this host for the message with a possible status character, the
+ size of the message in bytes, the date and time the message was
+ accepted into the queue, and the envelope sender of the message. The
+ second line shows the error message that caused this message to be
+ retained in the queue; it will not be present if the message is being
+ processed for the first time. The status characters are either ** to
+ indicate the job is being processed; XX to indicate that the load is too
+ high to process the job; and -- to indicate that the job is too young to
+ process. The following lines show message recipients, one per line.
+
+ MMaaiillqq is identical to ``sendmail -bp''.
+
+ The relevant options are as follows:
+
+ --AAcc Show the mail submission queue specified in _/_e_t_c_/_m_a_i_l_/_s_u_b_m_i_t_._c_f
+ instead of the MTA queue specified in _/_e_t_c_/_m_a_i_l_/_s_e_n_d_m_a_i_l_._c_f.
+
+ --qqLL Show the "lost" items in the mail queue instead of the normal
+ queue items.
+
+ --qqQQ Show the quarantined items in the mail queue instead of the nor-
+ mal queue items.
+
+ --qq[_!]I substr
+ Limit processed jobs to those containing _s_u_b_s_t_r as a substring
+ of the queue id or not when _! is specified.
+
+ --qq[_!]Q substr
+ Limit processed jobs to quarantined jobs containing _s_u_b_s_t_r as a
+ substring of the quarantine reason or not when _! is specified.
+
+ --qq[_!]R substr
+ Limit processed jobs to those containing _s_u_b_s_t_r as a substring
+ of one of the recipients or not when _! is specified.
+
+ --qq[_!]S substr
+ Limit processed jobs to those containing _s_u_b_s_t_r as a substring
+ of the sender or not when _! is specified.
+
+ --vv Print verbose information. This adds the priority of the mes-
+ sage and a single character indicator (``+'' or blank) indicat-
+ ing whether a warning message has been sent on the first line of
+ the message. Additionally, extra lines may be intermixed with
+ the recipients indicating the ``controlling user'' information;
+ this shows who will own any programs that are executed on behalf
+ of this message and the name of the alias this command expanded
+ from, if any. Moreover, status messages for each recipient are
+ printed if available.
+
+ Several sendmail.cf options influence the behavior of the mmaaiillqq util-
+ ity: The number of items printed per queue group is restricted by
+ MMaaxxQQuueeuueeRRuunnSSiizzee if that value is set. The status character ** is not
+ printed for some values of QQuueeuueeSSoorrttOOrrddeerr,, e.g., filename, random, mod-
+ ification, and none, unless a --qq option is used to limit the processed
+ jobs.
+
+ The mmaaiillqq utility exits 0 on success, and >0 if an error occurs.
+
+SSEEEE AALLSSOO
+ sendmail(8)
+
+HHIISSTTOORRYY
+ The mmaaiillqq command appeared in 4.0BSD.
+
+
+
+ $Date: 2013-11-22 20:51:55 $ MAILQ(1)
Modified: stable/0.8/contrib/sendmail/src/mailq.1
===================================================================
--- stable/0.8/contrib/sendmail/src/mailq.1 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/mailq.1 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1998-2000, 2002, 2007 Sendmail, Inc. and its suppliers.
+.\" Copyright (c) 1998-2000, 2002, 2007 Proofpoint, Inc. and its suppliers.
.\" All rights reserved.
.\" Copyright (c) 1983, 1997 Eric P. Allman. All rights reserved.
.\" Copyright (c) 1985, 1990, 1993
@@ -9,9 +9,9 @@
.\" the sendmail distribution.
.\"
.\"
-.\" $Id: mailq.1,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+.\" $Id: mailq.1,v 8.22 2013-11-22 20:51:55 ca Exp $
.\"
-.TH MAILQ 1 "$Date: 2007-11-23 22:10:30 $"
+.TH MAILQ 1 "$Date: 2013-11-22 20:51:55 $"
.SH NAME
mailq
\- print the mail queue
Modified: stable/0.8/contrib/sendmail/src/main.c
===================================================================
--- stable/0.8/contrib/sendmail/src/main.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/main.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2006, 2008, 2009, 2011 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2006, 2008, 2009, 2011 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -19,7 +19,7 @@
#ifndef lint
SM_UNUSED(static char copyright[]) =
-"@(#) Copyright (c) 1998-2003 Sendmail, Inc. and its suppliers.\n\
+"@(#) Copyright (c) 1998-2013 Proofpoint, Inc. and its suppliers.\n\
All rights reserved.\n\
Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.\n\
Copyright (c) 1988, 1993\n\
@@ -26,7 +26,7 @@
The Regents of the University of California. All rights reserved.\n";
#endif /* ! lint */
-SM_RCSID("@(#)$Id: main.c,v 1.1.1.9 2013-08-14 22:35:48 laffer1 Exp $")
+SM_RCSID("@(#)$Id: main.c,v 8.988 2013-11-23 02:52:37 gshapiro Exp $")
#if NETINET || NETINET6
@@ -77,7 +77,7 @@
** (11/88 - 9/89).
** UCB/Mammoth Project (10/89 - 7/95).
** InReference, Inc. (8/95 - 1/97).
-** Sendmail, Inc. (1/98 - present).
+** Sendmail, Inc. (1/98 - 9/13).
** The support of my employers is gratefully acknowledged.
** Few of them (Britton-Lee in particular) have had
** anything to gain from my involvement in this project.
@@ -84,10 +84,12 @@
**
** Gregory Neil Shapiro,
** Worcester Polytechnic Institute (until 3/98).
-** Sendmail, Inc. (3/98 - present).
+** Sendmail, Inc. (3/98 - 10/13).
+** Proofpoint, Inc. (10/13 - present).
**
** Claus Assmann,
-** Sendmail, Inc. (12/98 - present).
+** Sendmail, Inc. (12/98 - 10/13).
+** Proofpoint, Inc. (10/13 - present).
*/
char *FullName; /* sender's full name */
@@ -109,8 +111,8 @@
#if SASL
static sasl_callback_t srvcallbacks[] =
{
- { SASL_CB_VERIFYFILE, &safesaslfile, NULL },
- { SASL_CB_PROXY_POLICY, &proxy_policy, NULL },
+ { SASL_CB_VERIFYFILE, (sasl_callback_ft)&safesaslfile, NULL },
+ { SASL_CB_PROXY_POLICY, (sasl_callback_ft)&proxy_policy, NULL },
{ SASL_CB_LIST_END, NULL, NULL }
};
#endif /* SASL */
@@ -404,9 +406,7 @@
case MD_HOSTSTAT:
case MD_PURGESTAT:
case MD_ARPAFTP:
-#if _FFR_CHECKCONFIG
case MD_CHECKCONFIG:
-#endif /* _FFR_CHECKCONFIG */
OpMode = j;
break;
@@ -643,6 +643,17 @@
sm_printoptions(FFRCompileOptions);
}
+#if STARTTLS
+ if (tTd(0, 14))
+ {
+ /* exit(EX_CONFIG) if different? */
+ sm_dprintf(" OpenSSL: compiled 0x%08x\n",
+ (uint) OPENSSL_VERSION_NUMBER);
+ sm_dprintf(" OpenSSL: linked 0x%08x\n",
+ (uint) SSLeay());
+ }
+#endif /* STARTTLS */
+
/* clear sendmail's environment */
ExternalEnviron = environ;
emptyenviron[0] = NULL;
@@ -2564,6 +2575,38 @@
** Set _ macro in BlankEnvelope before calling newenvelope().
*/
+#if _FFR_XCNCT
+ if (bitnset(D_XCNCT, *p_flags) || bitnset(D_XCNCT_M, *p_flags))
+ {
+ /* copied from getauthinfo() */
+ if (RealHostName == NULL)
+ {
+ RealHostName = newstr(hostnamebyanyaddr(&RealHostAddr));
+ if (strlen(RealHostName) > MAXNAME)
+ RealHostName[MAXNAME] = '\0'; /* XXX - 1 ? */
+ }
+ snprintf(buf, sizeof(buf), "%s [%s]",
+ RealHostName, anynet_ntoa(&RealHostAddr));
+
+ forged = bitnset(D_XCNCT_M, *p_flags);
+ if (forged)
+ {
+ (void) sm_strlcat(buf, " (may be forged)",
+ sizeof(buf));
+ macdefine(&BlankEnvelope.e_macro, A_PERM,
+ macid("{client_resolve}"), "FORGED");
+ }
+
+ /* HACK! variable used only two times right below */
+ authinfo = buf;
+ if (tTd(75, 9))
+ sm_syslog(LOG_INFO, NOQID,
+ "main: where=not_calling_getauthinfo, RealHostAddr=%s",
+ anynet_ntoa(&RealHostAddr));
+ }
+ else
+ /* WARNING: "non-braced" else */
+#endif /* _FFR_XCNCT */
authinfo = getauthinfo(sm_io_getinfo(InChannel, SM_IO_WHAT_FD,
NULL), &forged);
macdefine(&BlankEnvelope.e_macro, A_TEMP, '_', authinfo);
@@ -2620,13 +2663,13 @@
#if NETINET
case AF_INET:
(void) sm_snprintf(pbuf, sizeof(pbuf), "%d",
- RealHostAddr.sin.sin_port);
+ ntohs(RealHostAddr.sin.sin_port));
break;
#endif /* NETINET */
#if NETINET6
case AF_INET6:
(void) sm_snprintf(pbuf, sizeof(pbuf), "%d",
- RealHostAddr.sin6.sin6_port);
+ ntohs(RealHostAddr.sin6.sin6_port));
break;
#endif /* NETINET6 */
default:
@@ -3694,12 +3737,12 @@
GIDSET_T emptygidset[1];
if (tTd(47, 1))
- sm_dprintf("drop_privileges(%d): Real[UG]id=%d:%d, get[ug]id=%d:%d, gete[ug]id=%d:%d, RunAs[UG]id=%d:%d\n",
+ sm_dprintf("drop_privileges(%d): Real[UG]id=%ld:%ld, get[ug]id=%ld:%ld, gete[ug]id=%ld:%ld, RunAs[UG]id=%ld:%ld\n",
(int) to_real_uid,
- (int) RealUid, (int) RealGid,
- (int) getuid(), (int) getgid(),
- (int) geteuid(), (int) getegid(),
- (int) RunAsUid, (int) RunAsGid);
+ (long) RealUid, (long) RealGid,
+ (long) getuid(), (long) getgid(),
+ (long) geteuid(), (long) getegid(),
+ (long) RunAsUid, (long) RunAsGid);
if (to_real_uid)
{
@@ -3774,15 +3817,15 @@
{
if (setgid(RunAsGid) < 0 && (!UseMSP || getegid() != RunAsGid))
{
- syserr("drop_privileges: setgid(%d) failed",
- (int) RunAsGid);
+ syserr("drop_privileges: setgid(%ld) failed",
+ (long) RunAsGid);
rval = EX_OSERR;
}
errno = 0;
if (rval == EX_OK && getegid() != RunAsGid)
{
- syserr("drop_privileges: Unable to set effective gid=%d to RunAsGid=%d",
- (int) getegid(), (int) RunAsGid);
+ syserr("drop_privileges: Unable to set effective gid=%ld to RunAsGid=%ld",
+ (long) getegid(), (long) RunAsGid);
rval = EX_OSERR;
}
}
@@ -4484,6 +4527,25 @@
(void) sm_io_fprintf(smioout, SM_TIME_DEFAULT,
"ul = %lu\n", ul);
}
+#if NETINET || NETINET6
+ else if (sm_strcasecmp(&line[1], "gethostbyname") == 0)
+ {
+ int family = AF_INET;
+
+ q = strpbrk(p, " \t");
+ if (q != NULL)
+ {
+ while (isascii(*q) && isspace(*q))
+ *q++ = '\0';
+# if NETINET6
+ if (*q != '\0' && (strcmp(q, "inet6") == 0 ||
+ strcmp(q, "AAAA") == 0))
+ family = AF_INET6;
+# endif /* NETINET6 */
+ }
+ (void) sm_gethostbyname(p, family);
+ }
+#endif /* NETINET || NETINET6 */
else
{
(void) sm_io_fprintf(smioout, SM_TIME_DEFAULT,
Copied: stable/0.8/contrib/sendmail/src/makesendmail (from rev 9097, trunk/contrib/sendmail/src/makesendmail)
===================================================================
--- stable/0.8/contrib/sendmail/src/makesendmail (rev 0)
+++ stable/0.8/contrib/sendmail/src/makesendmail 2016-10-01 17:46:48 UTC (rev 9102)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Copyright (c) 1999 Proofpoint, Inc. and its suppliers.
+# All rights reserved.
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the sendmail distribution.
+#
+#
+# $Id: makesendmail,v 8.5 2013-11-22 20:51:55 ca Exp $
+
+exec ./Build $*
Modified: stable/0.8/contrib/sendmail/src/map.c
===================================================================
--- stable/0.8/contrib/sendmail/src/map.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/map.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2008 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2008 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1992, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1992, 1993
@@ -13,7 +13,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: map.c,v 1.1.1.7 2013-08-14 22:35:48 laffer1 Exp $")
+SM_RCSID("@(#)$Id: map.c,v 8.713 2013-11-22 20:51:55 ca Exp $")
#if LDAPMAP
# include <sm/ldap.h>
@@ -204,6 +204,20 @@
map->map_app = ++p;
break;
+ case 'd':
+ {
+ char *h;
+
+ ++p;
+ h = strchr(p, ' ');
+ if (h != NULL)
+ *h = '\0';
+ map->map_timeout = convtime(p, 's');
+ if (h != NULL)
+ *h = ' ';
+ }
+ break;
+
case 'T':
map->map_tapp = ++p;
break;
@@ -1826,7 +1840,7 @@
data.dptr = buf;
if (tTd(38, 9))
sm_dprintf("ndbm_map_store append=%s\n",
- data.dptr);
+ (char *)data.dptr);
}
}
status = dbm_store((DBM *) map->map_db1,
@@ -7366,6 +7380,85 @@
return NULL;
}
+char *
+arpa_map_lookup(map, name, av, statp)
+ MAP *map;
+ char *name;
+ char **av;
+ int *statp;
+{
+ int r;
+ char *rval;
+ char result[128]; /* IPv6: 64 + 10 + 1 would be enough */
+
+ if (tTd(38, 2))
+ sm_dprintf("arpa_map_lookup: key '%s'\n", name);
+ *statp = EX_DATAERR;
+ r = 1;
+ memset(result, '\0', sizeof(result));
+ rval = NULL;
+
+# if NETINET6
+ if (sm_strncasecmp(name, "IPv6:", 5) == 0)
+ {
+ struct in6_addr in6_addr;
+
+ r = anynet_pton(AF_INET6, name, &in6_addr);
+ if (r == 1)
+ {
+ static char hex_digits[] =
+ { '0', '1', '2', '3', '4', '5', '6', '7', '8',
+ '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+
+ unsigned char *src;
+ char *dst;
+ int i;
+
+ src = (unsigned char *) &in6_addr;
+ dst = result;
+ for (i = 15; i >= 0; i--) {
+ *dst++ = hex_digits[src[i] & 0x0f];
+ *dst++ = '.';
+ *dst++ = hex_digits[(src[i] >> 4) & 0x0f];
+ if (i > 0)
+ *dst++ = '.';
+ }
+ *statp = EX_OK;
+ }
+ }
+ else
+# endif /* NETINET6 */
+# if NETINET
+ {
+ struct in_addr in_addr;
+
+ r = inet_pton(AF_INET, name, &in_addr);
+ if (r == 1)
+ {
+ unsigned char *src;
+
+ src = (unsigned char *) &in_addr;
+ (void) snprintf(result, sizeof(result),
+ "%u.%u.%u.%u",
+ src[3], src[2], src[1], src[0]);
+ *statp = EX_OK;
+ }
+ }
+# endif /* NETINET */
+ if (r < 0)
+ *statp = EX_UNAVAILABLE;
+ if (tTd(38, 2))
+ sm_dprintf("arpa_map_lookup: r=%d, result='%s'\n", r, result);
+ if (*statp == EX_OK)
+ {
+ if (bitset(MF_MATCHONLY, map->map_mflags))
+ rval = map_rewrite(map, name, strlen(name), NULL);
+ else
+ rval = map_rewrite(map, result, strlen(result), av);
+ }
+ return rval;
+}
+
#if SOCKETMAP
# if NETINET || NETINET6
@@ -7385,6 +7478,7 @@
{
STAB *s;
int sock = 0;
+ int tmo;
SOCKADDR_LEN_T addrlen = 0;
int addrno = 0;
int save_errno;
@@ -7784,6 +7878,13 @@
return false;
}
+ tmo = map->map_timeout;
+ if (tmo == 0)
+ tmo = 30000; /* default: 30s */
+ else
+ tmo *= 1000; /* s -> ms */
+ sm_io_setinfo(map->map_db1, SM_IO_WHAT_TIMEOUT, &tmo);
+
/* Save connection for reuse */
s->s_socketmap = map;
return true;
@@ -7918,8 +8019,16 @@
if (sm_io_fscanf(f, SM_TIME_DEFAULT, "%9u", &replylen) != 1)
{
- syserr("451 4.3.0 socket_map_lookup(%s): failed to read length parameter of reply",
- map->map_mname);
+ if (errno == EAGAIN)
+ {
+ syserr("451 4.3.0 socket_map_lookup(%s): read timeout",
+ map->map_mname);
+ }
+ else
+ {
+ syserr("451 4.3.0 socket_map_lookup(%s): failed to read length parameter of reply %d",
+ map->map_mname, errno);
+ }
*statp = EX_TEMPFAIL;
goto errcl;
}
Modified: stable/0.8/contrib/sendmail/src/map.h
===================================================================
--- stable/0.8/contrib/sendmail/src/map.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/map.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: map.h,v 1.1.1.1 2007-11-23 22:10:30 laffer1 Exp $
+ * $Id: map.h,v 8.4 2013-11-22 20:51:56 ca Exp $
*/
#ifndef _MAP_H
Modified: stable/0.8/contrib/sendmail/src/mci.c
===================================================================
--- stable/0.8/contrib/sendmail/src/mci.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/mci.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2005, 2010 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2005, 2010 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: mci.c,v 1.1.1.7 2013-08-14 22:35:48 laffer1 Exp $")
+SM_RCSID("@(#)$Id: mci.c,v 8.225 2013-11-22 20:51:56 ca Exp $")
#if NETINET || NETINET6
# include <arpa/inet.h>
@@ -352,6 +352,7 @@
#if PIPELINING
mci->mci_okrcpts = 0;
#endif /* PIPELINING */
+ mci->mci_flags &= ~MCIF_NOTSTICKY;
if (mci->mci_rpool == NULL)
mci->mci_rpool = sm_rpool_new_x(NULL);
Modified: stable/0.8/contrib/sendmail/src/milter.c
===================================================================
--- stable/0.8/contrib/sendmail/src/milter.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/milter.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2009, 2012, 2013 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2009, 2012, 2013 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: milter.c,v 1.1.1.6 2013-08-14 22:35:48 laffer1 Exp $")
+SM_RCSID("@(#)$Id: milter.c,v 8.281 2013-11-22 20:51:56 ca Exp $")
#if MILTER
# include <sm/sendmail.h>
@@ -204,7 +204,7 @@
fd_set fds; \
struct timeval tv; \
\
- if (SM_FD_SETSIZE > 0 && m->mf_sock >= SM_FD_SETSIZE) \
+ if (!SM_FD_OK_SELECT(m->mf_sock)) \
{ \
if (tTd(64, 5)) \
sm_dprintf("milter_%s(%s): socket %d is larger than FD_SETSIZE %d\n", \
@@ -1642,8 +1642,8 @@
MilterMaxDataSize != MILTER_MDS_1M)
{
sm_syslog(LOG_WARNING, NOQID,
- "WARNING: Milter.%s=%d, allowed are only %d, %d, and %d",
- name, MilterMaxDataSize,
+ "WARNING: Milter.%s=%lu, allowed are only %d, %d, and %d",
+ name, (unsigned long) MilterMaxDataSize,
MILTER_MDS_64K, MILTER_MDS_256K,
MILTER_MDS_1M);
if (MilterMaxDataSize < MILTER_MDS_64K)
@@ -2317,6 +2317,8 @@
offset += MILTER_LEN_BYTES;
macros = NULL;
+#define SM_M_MACRO_NAME(i) (((i) < SM_ARRAY_SIZE(MilterOptTab) && (i) >= 0) \
+ ? MilterOptTab[i].mo_name : "?")
switch (i)
{
case SMFIM_CONNECT:
@@ -2330,7 +2332,7 @@
macros = MilterMacros[i][m->mf_idx];
m->mf_lflags |= MI_LFLAGS_SYM(i);
len = strlen(buf + offset);
- if (len > 0)
+ if (len >= 0)
{
r = milter_set_macros(m->mf_name, macros,
buf + offset, nummac);
@@ -2337,8 +2339,10 @@
if (r >= 0)
nummac = r;
if (tTd(64, 5))
- sm_dprintf("milter_getsymlist(%s, %s)=%d\n",
- m->mf_name, buf + offset, r);
+ sm_dprintf("milter_getsymlist(%s, %s, \"%s\")=%d\n",
+ m->mf_name,
+ SM_M_MACRO_NAME(i),
+ buf + offset, r);
}
break;
@@ -2345,8 +2349,6 @@
default:
return -1;
}
- if (len == 0)
- return -1;
offset += len + 1;
}
@@ -2421,7 +2423,9 @@
if (tTd(64, 5))
sm_dprintf("milter_negotiate(%s): send: version %lu, fflags 0x%lx, pflags 0x%lx\n",
- m->mf_name, ntohl(fvers), ntohl(fflags), ntohl(pflags));
+ m->mf_name, (unsigned long) ntohl(fvers),
+ (unsigned long) ntohl(fflags),
+ (unsigned long) ntohl(pflags));
response = milter_read(m, &rcmd, &rlen, m->mf_timeout[SMFTO_READ], e,
"negotiate");
@@ -2526,8 +2530,9 @@
{
/* this should not happen... */
sm_syslog(LOG_WARNING, NOQID,
- "WARNING: Milter.maxdatasize: configured=%d, set by libmilter=%d",
- MilterMaxDataSize, MILTER_MDS_1M);
+ "WARNING: Milter.maxdatasize: configured=%lu, set by libmilter=%d",
+ (unsigned long) MilterMaxDataSize,
+ MILTER_MDS_1M);
MilterMaxDataSize = MILTER_MDS_1M;
}
}
@@ -2536,8 +2541,9 @@
if (MilterMaxDataSize != MILTER_MDS_256K)
{
sm_syslog(LOG_WARNING, NOQID,
- "WARNING: Milter.maxdatasize: configured=%d, set by libmilter=%d",
- MilterMaxDataSize, MILTER_MDS_256K);
+ "WARNING: Milter.maxdatasize: configured=%lu, set by libmilter=%d",
+ (unsigned long) MilterMaxDataSize,
+ MILTER_MDS_256K);
MilterMaxDataSize = MILTER_MDS_256K;
}
}
@@ -2544,8 +2550,9 @@
else if (MilterMaxDataSize != MILTER_MDS_64K)
{
sm_syslog(LOG_WARNING, NOQID,
- "WARNING: Milter.maxdatasize: configured=%d, set by libmilter=%d",
- MilterMaxDataSize, MILTER_MDS_64K);
+ "WARNING: Milter.maxdatasize: configured=%lu, set by libmilter=%d",
+ (unsigned long) MilterMaxDataSize,
+ MILTER_MDS_64K);
MilterMaxDataSize = MILTER_MDS_64K;
}
m->mf_pflags &= ~SMFI_INTERNAL;
@@ -3976,6 +3983,7 @@
else
milter_per_connection_check(e);
+#if !_FFR_MILTER_CONNECT_REPLYCODE
/*
** SMFIR_REPLYCODE can't work with connect due to
** the requirements of SMTP. Therefore, ignore the
@@ -4000,6 +4008,7 @@
response = NULL;
}
}
+#endif /* !_FFR_MILTER_CONNECT_REPLYCODE */
return response;
}
Modified: stable/0.8/contrib/sendmail/src/mime.c
===================================================================
--- stable/0.8/contrib/sendmail/src/mime.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/mime.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2003, 2006, 2013 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2003, 2006, 2013 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1994, 1996-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1994
@@ -14,7 +14,7 @@
#include <sendmail.h>
#include <string.h>
-SM_RCSID("@(#)$Id: mime.c,v 1.1.1.5 2013-08-14 22:35:48 laffer1 Exp $")
+SM_RCSID("@(#)$Id: mime.c,v 8.149 2013-11-22 20:51:56 ca Exp $")
/*
** MIME support.
Copied: stable/0.8/contrib/sendmail/src/newaliases.0 (from rev 9097, trunk/contrib/sendmail/src/newaliases.0)
===================================================================
--- stable/0.8/contrib/sendmail/src/newaliases.0 (rev 0)
+++ stable/0.8/contrib/sendmail/src/newaliases.0 2016-10-01 17:46:48 UTC (rev 9102)
@@ -0,0 +1,35 @@
+NEWALIASES(1) NEWALIASES(1)
+
+
+
+NNAAMMEE
+ newaliases - rebuild the data base for the mail aliases file
+
+SSYYNNOOPPSSIISS
+ nneewwaalliiaasseess
+
+DDEESSCCRRIIPPTTIIOONN
+ NNeewwaalliiaasseess rebuilds the random access data base for the mail aliases
+ file /etc/mail/aliases. It must be run each time this file is changed
+ in order for the change to take effect.
+
+ NNeewwaalliiaasseess is identical to ``sendmail -bi''.
+
+ The nneewwaalliiaasseess utility exits 0 on success, and >0 if an error occurs.
+
+ Notice: do nnoott use mmaakkeemmaapp to create the aliases data base, because
+ nneewwaalliiaasseess puts a special token into the data base that is required by
+ sseennddmmaaiill..
+
+FFIILLEESS
+ /etc/mail/aliases The mail aliases file
+
+SSEEEE AALLSSOO
+ aliases(5), sendmail(8)
+
+HHIISSTTOORRYY
+ The nneewwaalliiaasseess command appeared in 4.0BSD.
+
+
+
+ $Date: 2013-11-22 20:51:56 $ NEWALIASES(1)
Modified: stable/0.8/contrib/sendmail/src/newaliases.1
===================================================================
--- stable/0.8/contrib/sendmail/src/newaliases.1 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/newaliases.1 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+.\" Copyright (c) 1998-2001 Proofpoint, Inc. and its suppliers.
.\" All rights reserved.
.\" Copyright (c) 1983, 1997 Eric P. Allman. All rights reserved.
.\" Copyright (c) 1985, 1990, 1993
@@ -9,9 +9,9 @@
.\" the sendmail distribution.
.\"
.\"
-.\" $Id: newaliases.1,v 1.1.1.2 2006-02-25 02:33:59 laffer1 Exp $
+.\" $Id: newaliases.1,v 8.20 2013-11-22 20:51:56 ca Exp $
.\"
-.TH NEWALIASES 1 "$Date: 2006-02-25 02:33:59 $"
+.TH NEWALIASES 1 "$Date: 2013-11-22 20:51:56 $"
.SH NAME
newaliases
\- rebuild the data base for the mail aliases file
Modified: stable/0.8/contrib/sendmail/src/parseaddr.c
===================================================================
--- stable/0.8/contrib/sendmail/src/parseaddr.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/parseaddr.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: parseaddr.c,v 1.1.1.7 2013-08-14 22:35:48 laffer1 Exp $")
+SM_RCSID("@(#)$Id: parseaddr.c,v 8.407 2013-11-22 20:51:56 ca Exp $")
#include <sm/sendmail.h>
#include "map.h"
@@ -2204,8 +2204,9 @@
** use entire pvp.
** buf -- buffer to build the string into.
** sz -- size of buf.
-** spacesub -- the space separator character; if '\0',
-** use SpaceSub.
+** spacesub -- the space separator character;
+** '\0': SpaceSub.
+** NOSPACESEP: no separator
** external -- convert to external form?
** (no metacharacters; METAQUOTEs removed, see below)
**
@@ -2268,7 +2269,7 @@
char *q;
natomtok = (IntTokenTab[**pvp & 0xff] == ATM);
- if (oatomtok && natomtok)
+ if (oatomtok && natomtok && spacesub != NOSPACESEP)
{
*p++ = spacesub;
if (--sz <= 0)
@@ -2362,6 +2363,10 @@
if (strcmp(a->q_user, b->q_user) != 0)
return false;
+ /* do the required flags match? */
+ if (!ADDR_FLAGS_MATCH(a, b))
+ return false;
+
/* if we have good uids for both but they differ, these are different */
if (a->q_mailer == ProgMailer)
{
@@ -2409,6 +2414,7 @@
unsigned long qf_bit;
};
+/* :'a,.s;^#define \(Q[A-Z]*\) .*; { "\1", \1 },; */
static struct qflags AddressFlags[] =
{
{ "QGOODUID", QGOODUID },
@@ -2426,6 +2432,12 @@
{ "QDELIVERED", QDELIVERED },
{ "QDELAYED", QDELAYED },
{ "QTHISPASS", QTHISPASS },
+ { "QALIAS", QALIAS },
+ { "QBYTRACE", QBYTRACE },
+ { "QBYNDELAY", QBYNDELAY },
+ { "QBYNRELAY", QBYNRELAY },
+ { "QINTBCC", QINTBCC },
+ { "QDYNMAILER", QDYNMAILER },
{ "QRCPTOK", QRCPTOK },
{ NULL, 0 }
};
@@ -2789,7 +2801,7 @@
{
sm_dprintf("remotename => `");
xputs(sm_debug_file(), buf);
- sm_dprintf("'\n");
+ sm_dprintf("', stat=%d\n", *pstat);
}
return buf;
}
@@ -3060,6 +3072,8 @@
** logid -- id for sm_syslog.
** addr -- if not NULL and ruleset returns $#error:
** store mailer triple here.
+** addrstr -- if not NULL and ruleset does not return $#:
+** address string
**
** Returns:
** EX_OK -- if the rwset doesn't resolve to $#error
@@ -3067,7 +3081,7 @@
*/
int
-rscheck(rwset, p1, p2, e, flags, logl, host, logid, addr)
+rscheck(rwset, p1, p2, e, flags, logl, host, logid, addr, addrstr)
char *rwset;
char *p1;
char *p2;
@@ -3077,6 +3091,7 @@
char *host;
char *logid;
ADDRESS *addr;
+ char **addrstr;
{
char *volatile buf;
size_t bufsize;
@@ -3150,6 +3165,17 @@
(void) REWRITE(pvp, rsno, e);
if (bitset(RSF_UNSTRUCTURED, flags))
SuprErrs = saveSuprErrs;
+
+ if (pvp[0] != NULL && (pvp[0][0] & 0377) != CANONNET &&
+ bitset(RSF_ADDR, flags) && addrstr != NULL)
+ {
+ cataddr(&(pvp[0]), NULL, ubuf, sizeof(ubuf),
+ bitset(RSF_STRING, flags) ? NOSPACESEP : ' ',
+ true);
+ *addrstr = sm_rpool_strdup_x(e->e_rpool, ubuf);
+ goto finis;
+ }
+
if (pvp[0] == NULL || (pvp[0][0] & 0377) != CANONNET ||
pvp[1] == NULL || (strcmp(pvp[1], "error") != 0 &&
strcmp(pvp[1], "discard") != 0))
Modified: stable/0.8/contrib/sendmail/src/queue.c
===================================================================
--- stable/0.8/contrib/sendmail/src/queue.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/queue.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2009, 2011, 2012 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2009, 2011, 2012, 2014 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -14,7 +14,7 @@
#include <sendmail.h>
#include <sm/sem.h>
-SM_RCSID("@(#)$Id: queue.c,v 1.1.1.9 2013-08-14 22:35:48 laffer1 Exp $")
+SM_RCSID("@(#)$Id: queue.c,v 8.1000 2013-11-22 20:51:56 ca Exp $")
#include <dirent.h>
@@ -125,13 +125,6 @@
"@(#)$Debug: leak_q - trace memory leaks during queue processing $");
#endif /* SM_HEAP_CHECK */
-/*
-** We use EmptyString instead of "" to avoid
-** 'zero-length format string' warnings from gcc
-*/
-
-static const char EmptyString[] = "";
-
static void grow_wlist __P((int, int));
static int multiqueue_cache __P((char *, int, QUEUEGRP *, int, unsigned int *));
static int gatherq __P((int, int, bool, bool *, bool *, int *));
@@ -304,7 +297,7 @@
** d data file directory name (added in 8.12)
** E error recipient
** F flag bits
-** G free (was: queue delay algorithm if _FFR_QUEUEDELAY)
+** G free
** H header
** I data file's inode number
** K time of last delivery attempt
@@ -320,7 +313,7 @@
** T init time
** V queue file version
** X free (was: character set if _FFR_SAVE_CHARSET)
-** Y free (was: current delay if _FFR_QUEUEDELAY)
+** Y free
** Z original envelope id from ESMTP
** ! deliver by (added in 8.12)
** $ define macro
@@ -404,8 +397,8 @@
printopenfds(true);
errno = save_errno;
- syserr("!queueup: cannot create queue file %s, euid=%d, fd=%d, fp=%p",
- tf, (int) geteuid(), tfd, tfp);
+ syserr("!queueup: cannot create queue file %s, euid=%ld, fd=%d, fp=%p",
+ tf, (long) geteuid(), tfd, tfp);
/* NOTREACHED */
}
e->e_lockfp = tfp;
@@ -427,8 +420,8 @@
break;
if (LogLevel > 0 && (i % 32) == 0)
sm_syslog(LOG_ALERT, e->e_id,
- "queueup: cannot create %s, euid=%d: %s",
- tf, (int) geteuid(),
+ "queueup: cannot create %s, euid=%ld: %s",
+ tf, (long) geteuid(),
sm_errstring(errno));
}
#if SM_OPEN_EXLOCK
@@ -473,8 +466,8 @@
printopenfds(true);
errno = save_errno;
- syserr("!queueup: cannot create queue temp file %s, uid=%d",
- tf, (int) geteuid());
+ syserr("!queueup: cannot create queue temp file %s, uid=%ld",
+ tf, (long) geteuid());
}
}
@@ -518,8 +511,8 @@
sm_io_setinfo(e->e_dfp, SM_BF_COMMIT, NULL) < 0 &&
errno != EINVAL)
{
- syserr("!queueup: cannot commit data file %s, uid=%d",
- queuename(e, DATAFL_LETTER), (int) geteuid());
+ syserr("!queueup: cannot commit data file %s, uid=%ld",
+ queuename(e, DATAFL_LETTER), (long) geteuid());
}
if (e->e_dfp != NULL &&
SuperSafe == SAFE_INTERACTIVE && msync)
@@ -560,8 +553,8 @@
if (dfd < 0 || (dfp = sm_io_open(SmFtStdiofd, SM_TIME_DEFAULT,
(void *) &dfd, SM_IO_WRONLY_B,
NULL)) == NULL)
- syserr("!queueup: cannot create data temp file %s, uid=%d",
- df, (int) geteuid());
+ syserr("!queueup: cannot create data temp file %s, uid=%ld",
+ df, (long) geteuid());
if (fstat(dfd, &stbuf) < 0)
e->e_dfino = -1;
else
@@ -595,8 +588,8 @@
}
if (sm_io_close(dfp, SM_TIME_DEFAULT) < 0)
- syserr("!queueup: cannot save data temp file %s, uid=%d",
- df, (int) geteuid());
+ syserr("!queueup: cannot save data temp file %s, uid=%ld",
+ df, (long) geteuid());
e->e_putbody = putbody;
}
@@ -733,9 +726,15 @@
(void) sm_io_putc(tfp, SM_TIME_DEFAULT, 'F');
if (bitset(QPINGONDELAY, q->q_flags))
(void) sm_io_putc(tfp, SM_TIME_DEFAULT, 'D');
+ if (bitset(QINTBCC, q->q_flags))
+ (void) sm_io_putc(tfp, SM_TIME_DEFAULT, 'B');
if (q->q_alias != NULL &&
bitset(QALIAS, q->q_alias->q_flags))
(void) sm_io_putc(tfp, SM_TIME_DEFAULT, 'A');
+
+ /* _FFR_RCPTFLAGS */
+ if (bitset(QDYNMAILER, q->q_flags))
+ (void) sm_io_putc(tfp, SM_TIME_DEFAULT, QDYNMAILFLG);
(void) sm_io_putc(tfp, SM_TIME_DEFAULT, ':');
(void) sm_io_fprintf(tfp, SM_TIME_DEFAULT, "%s\n",
denlstring(q->q_paddr, true, false));
@@ -747,10 +746,10 @@
tag = "quarantined";
e->e_to = q->q_paddr;
- message(tag);
+ message("%s", tag);
if (LogLevel > 8)
logdelivery(q->q_mailer, NULL, q->q_status,
- tag, NULL, (time_t) 0, e);
+ tag, NULL, (time_t) 0, e, q, EX_OK);
e->e_to = NULL;
}
if (tTd(40, 1))
@@ -888,8 +887,8 @@
(void) sm_strlcpy(qf, queuename(e, ANYQFL_LETTER),
sizeof(qf));
if (rename(tf, qf) < 0)
- syserr("cannot rename(%s, %s), uid=%d",
- tf, qf, (int) geteuid());
+ syserr("cannot rename(%s, %s), uid=%ld",
+ tf, qf, (long) geteuid());
else
{
/*
@@ -1785,7 +1784,7 @@
if (shouldqueue(w->w_pri, w->w_ctime))
{
if (Verbose)
- message(EmptyString);
+ message("%s", "");
if (QueueSortOrder == QSO_BYPRIORITY)
{
if (Verbose)
@@ -1813,7 +1812,7 @@
{
if (Verbose)
{
- message(EmptyString);
+ message("%s", "");
message("Running %s/%s (sequence %d of %d)",
qid_printqueue(w->w_qgrp, w->w_qdir),
w->w_name + 2, sequenceno, njobs);
@@ -2042,9 +2041,7 @@
{
IgnoreHostStatus = true;
MinQueueAge = 0;
-#if _FFR_EXPDELAY
MaxQueueAge = 0;
-#endif /* _FFR_EXPDELAY */
}
/*
@@ -2871,7 +2868,6 @@
break;
case 'K':
-#if _FFR_EXPDELAY
if (MaxQueueAge > 0)
{
time_t lasttry, delay;
@@ -2884,7 +2880,6 @@
w->w_tooyoung = true;
break;
}
-#endif /* _FFR_EXPDELAY */
age = curtime() - (time_t) atol(&lbuf[1]);
if (age >= 0 && MinQueueAge > 0 &&
@@ -2940,7 +2935,7 @@
**
** First the old WorkQ is cleared away. Then the WorkList is sorted
** for all items so that important (higher sorting value) items are not
-** trunctated off. Then the most important items are moved from
+** truncated off. Then the most important items are moved from
** WorkList to WorkQ. The lower count of 'max' or MaxListCount items
** are moved.
**
@@ -4096,8 +4091,9 @@
if (LogLevel > 0)
{
sm_syslog(LOG_ALERT, e->e_id,
- "bogus queue file, uid=%d, gid=%d, mode=%o",
- st.st_uid, st.st_gid, st.st_mode);
+ "bogus queue file, uid=%ld, gid=%ld, mode=%o",
+ (long) st.st_uid, (long) st.st_gid,
+ (unsigned int) st.st_mode);
}
if (tTd(40, 8))
sm_dprintf("readqf(%s): bogus file\n", qf);
@@ -4418,6 +4414,14 @@
ctladdr->q_flags |= QALIAS;
break;
+ case 'B':
+ qflags |= QINTBCC;
+ break;
+
+ case QDYNMAILFLG:
+ qflags |= QDYNMAILER;
+ break;
+
default: /* ignore or complain? */
break;
}
@@ -4426,7 +4430,7 @@
else
qflags |= QPRIMARY;
macdefine(&e->e_macro, A_PERM, macid("{addr_type}"),
- "e r");
+ ((qflags & QINTBCC) != 0) ? "e b" : "e r");
if (*p != '\0')
q = parseaddr(++p, NULLADDR, RF_COPYALL, '\0',
NULL, e, true);
@@ -4443,6 +4447,10 @@
q->q_flags |= qflags;
q->q_finalrcpt = frcpt;
q->q_orcpt = orcpt;
+#if _FFR_RCPTFLAGS
+ if (bitset(QDYNMAILER, qflags))
+ newmodmailer(q, QDYNMAILFLG);
+#endif
(void) recipient(q, &e->e_sendqueue, 0, e);
}
frcpt = NULL;
@@ -4500,24 +4508,6 @@
nomore = true;
break;
-#if _FFR_QUEUEDELAY
- case 'G':
- case 'Y':
-
- /*
- ** Maintain backward compatibility for
- ** users who defined _FFR_QUEUEDELAY in
- ** previous releases. Remove this
- ** code in 8.14 or 8.15.
- */
-
- if (qfver == 5 || qfver == 7)
- break;
-
- /* If not qfver 5 or 7, then 'G' or 'Y' is invalid */
- /* FALLTHROUGH */
-#endif /* _FFR_QUEUEDELAY */
-
default:
syserr("readqf: %s: line %d: bad line \"%s\"",
qf, LineNumber, shortenstring(bp, MAXSHORTSTR));
@@ -4635,6 +4625,14 @@
static void prtstr __P((char *, int));
+#if _FFR_BOUNCE_QUEUE
+# define SKIP_BOUNCE_QUEUE \
+ if (i == BounceQueue) \
+ continue;
+#else
+# define SKIP_BOUNCE_QUEUE
+#endif
+
static void
prtstr(s, ml)
char *s;
@@ -4698,6 +4696,7 @@
{
int j;
+ SKIP_BOUNCE_QUEUE
k++;
for (j = 0; j < Queue[i]->qg_numqueues; j++)
{
@@ -5643,8 +5642,8 @@
{
p = queuename(e, LOSEQF_LETTER);
if (rename(buf, p) < 0)
- syserr("cannot rename(%s, %s), uid=%d",
- buf, p, (int) geteuid());
+ syserr("cannot rename(%s, %s), uid=%ld",
+ buf, p, (long) geteuid());
else if (LogLevel > 0)
sm_syslog(LOG_ALERT, e->e_id,
"Losing %s: %s", buf, why);
@@ -6656,8 +6655,8 @@
r = sm_semsetowner(SemId, RunAsUid, RunAsGid, 0660);
if (r != 0)
sm_syslog(LOG_ERR, NOQID,
- "key=%ld, sm_semsetowner=%d, RunAsUid=%d, RunAsGid=%d",
- (long) SemKey, r, RunAsUid, RunAsGid);
+ "key=%ld, sm_semsetowner=%d, RunAsUid=%ld, RunAsGid=%ld",
+ (long) SemKey, r, (long) RunAsUid, (long) RunAsGid);
}
#endif /* SM_CONF_SEM */
#endif /* _FFR_USE_SEM_LOCKING */
@@ -6734,11 +6733,12 @@
if (QSHM_ENTRIES(idx) >= 0 && count != 0)
{
# if _FFR_USE_SEM_LOCKING
- r = sm_sem_acq(SemId, 0, 1);
+ if (SemId >= 0)
+ r = sm_sem_acq(SemId, 0, 1);
# endif /* _FFR_USE_SEM_LOCKING */
QSHM_ENTRIES(idx) += count;
# if _FFR_USE_SEM_LOCKING
- if (r >= 0)
+ if (SemId >= 0 && r >= 0)
r = sm_sem_rel(SemId, 0, 1);
# endif /* _FFR_USE_SEM_LOCKING */
}
@@ -6815,8 +6815,8 @@
int err = errno;
sm_syslog(LOG_ALERT, NOQID,
- "ownership change on %s to %d failed: %s",
- keypath, RunAsUid, sm_errstring(err));
+ "ownership change on %s to %ld failed: %s",
+ keypath, (long) RunAsUid, sm_errstring(err));
}
# endif /* HASFCHOWN */
}
@@ -6966,8 +6966,8 @@
i = sm_shmsetowner(ShmId, RunAsUid, RunAsGid, 0660);
if (i != 0)
sm_syslog(LOG_ERR, NOQID,
- "key=%ld, sm_shmsetowner=%d, RunAsUid=%d, RunAsGid=%d",
- (long) ShmKey, i, RunAsUid, RunAsGid);
+ "key=%ld, sm_shmsetowner=%d, RunAsUid=%ld, RunAsGid=%ld",
+ (long) ShmKey, i, (long) RunAsUid, (long) RunAsGid);
}
p = (int *) Pshm;
if (owner)
@@ -7155,19 +7155,19 @@
safefile(" ", RunAsUid, RunAsGid, RunAsUserName, sff,
QueueFileMode, NULL) != 0)
{
- syserr("can not write to queue directory %s (RunAsGid=%d, required=%d)",
- basedir, (int) RunAsGid, (int) st.st_gid);
+ syserr("can not write to queue directory %s (RunAsGid=%ld, required=%ld)",
+ basedir, (long) RunAsGid, (long) st.st_gid);
}
if (bitset(S_IWOTH|S_IXOTH, st.st_mode))
{
#if _FFR_MSP_PARANOIA
syserr("dangerous permissions=%o on queue directory %s",
- (int) st.st_mode, basedir);
+ (unsigned int) st.st_mode, basedir);
#else /* _FFR_MSP_PARANOIA */
if (LogLevel > 0)
sm_syslog(LOG_ERR, NOQID,
"dangerous permissions=%o on queue directory %s",
- (int) st.st_mode, basedir);
+ (unsigned int) st.st_mode, basedir);
#endif /* _FFR_MSP_PARANOIA */
}
#if _FFR_MSP_PARANOIA
@@ -7619,7 +7619,7 @@
}
/*
-** MAKEWORKGROUP -- balance queue groups into work groups per MaxQueueChildren
+** MAKEWORKGROUPS -- balance queue groups into work groups per MaxQueueChildren
**
** Take the now defined queue groups and assign them to work groups.
** This is done to balance out the number of concurrently active
@@ -7691,6 +7691,7 @@
NumWorkGroups = 0;
for (i = 0; i < NumQueue; i++)
{
+ SKIP_BOUNCE_QUEUE
total_runners += si[i].sg_maxqrun;
if (MaxQueueChildren <= 0 || total_runners <= MaxQueueChildren)
NumWorkGroups++;
@@ -7716,6 +7717,8 @@
dir = 1;
for (i = 0; i < NumQueue; i++)
{
+ SKIP_BOUNCE_QUEUE
+
/* a to-and-fro packing scheme, continue from last position */
if (j >= NumWorkGroups)
{
Modified: stable/0.8/contrib/sendmail/src/ratectrl.c
===================================================================
--- stable/0.8/contrib/sendmail/src/ratectrl.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/ratectrl.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2003 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -45,7 +45,7 @@
*/
#include <sendmail.h>
-SM_RCSID("@(#)$Id: ratectrl.c,v 1.1.1.6 2010-01-10 20:14:37 laffer1 Exp $")
+SM_RCSID("@(#)$Id: ratectrl.c,v 8.14 2013-11-22 20:51:56 ca Exp $")
/*
** stuff included - given some warnings (inet_ntoa)
Modified: stable/0.8/contrib/sendmail/src/readcf.c
===================================================================
--- stable/0.8/contrib/sendmail/src/readcf.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/readcf.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2006, 2008-2010, 2013 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2006, 2008-2010, 2013 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -14,7 +14,7 @@
#include <sendmail.h>
#include <sm/sendmail.h>
-SM_RCSID("@(#)$Id: readcf.c,v 1.1.1.8 2013-08-14 22:35:48 laffer1 Exp $")
+SM_RCSID("@(#)$Id: readcf.c,v 8.692 2013-11-22 20:51:56 ca Exp $")
#if NETINET || NETINET6
# include <arpa/inet.h>
@@ -33,7 +33,52 @@
static char *extrquotstr __P((char *, char **, char *, bool *));
static void parse_class_words __P((int, char *));
+
+#if _FFR_BOUNCE_QUEUE
+static char *bouncequeue = NULL;
+static void initbouncequeue __P((void));
+
/*
+** INITBOUNCEQUEUE -- determine BounceQueue if option is set.
+**
+** Parameters:
+** none.
+**
+** Returns:
+** none.
+**
+** Side Effects:
+** sets BounceQueue
+*/
+
+static void
+initbouncequeue()
+{
+ STAB *s;
+
+ BounceQueue = NOQGRP;
+ if (bouncequeue == NULL || bouncequeue[0] == '\0')
+ return;
+
+ s = stab(bouncequeue, ST_QUEUE, ST_FIND);
+ if (s == NULL)
+ {
+ (void) sm_io_fprintf(smioout, SM_TIME_DEFAULT,
+ "Warning: option BounceQueue: unknown queue group %s\n",
+ bouncequeue);
+ }
+ else
+ BounceQueue = s->s_quegrp->qg_index;
+}
+#endif /* _FFR_BOUNCE_QUEUE */
+
+#if _FFR_RCPTFLAGS
+void setupdynmailers __P((void));
+#else
+#define setupdynmailers()
+#endif
+
+/*
** READCF -- read configuration file.
**
** This routine reads the configuration file and builds the internal
@@ -117,13 +162,18 @@
#if STARTTLS
Srv_SSL_Options = SSL_OP_ALL;
Clt_SSL_Options = SSL_OP_ALL
-#ifdef SSL_OP_NO_SSLv2
+# ifdef SSL_OP_NO_SSLv2
| SSL_OP_NO_SSLv2
-#endif
-#ifdef SSL_OP_NO_TICKET
+# endif
+# ifdef SSL_OP_NO_TICKET
| SSL_OP_NO_TICKET
-#endif
+# endif
;
+# ifdef SSL_OP_TLSEXT_PADDING
+ /* SSL_OP_TLSEXT_PADDING breaks compatibility with some sites */
+ Srv_SSL_Options &= ~SSL_OP_TLSEXT_PADDING;
+ Clt_SSL_Options &= ~SSL_OP_TLSEXT_PADDING;
+# endif /* SSL_OP_TLSEXT_PADDING */
#endif /* STARTTLS */
if (DontLockReadFiles)
sff |= SFF_NOLOCK;
@@ -725,6 +775,10 @@
(void) sm_io_close(cf, SM_TIME_DEFAULT);
FileName = NULL;
+#if _FFR_BOUNCE_QUEUE
+ initbouncequeue();
+#endif
+
/* initialize host maps from local service tables */
inithostmaps();
@@ -751,6 +805,7 @@
}
}
}
+ setupdynmailers();
}
/*
@@ -1170,7 +1225,126 @@
if (pid > 0)
(void) waitfor(pid);
}
+
+#if _FFR_RCPTFLAGS
+/* first character for dynamically created mailers */
+static char dynmailerp = ' ';
+
+/* list of first characters for cf defined mailers */
+static char frst[MAXMAILERS + 1];
+
/*
+** SETUPDYNMAILERS -- find a char that isn't used as first element of any
+** mailer name.
+**
+** Parameters:
+** none
+**
+** Returns:
+** none
+**
+** Note: space is not valid in cf defined mailers hence the function
+** will always find a char. It's not nice, but this is for
+** internal names only.
+*/
+
+void
+setupdynmailers()
+{
+ int i;
+ char pp[] = "YXZ0123456789ABCDEFGHIJKLMNOPQRSTUVWyxzabcfghijkmnoqtuvw ";
+
+ frst[MAXMAILERS] = '\0';
+ for (i = 0; i < strlen(pp); i++)
+ {
+ if (strchr(frst, pp[i]) == NULL)
+ {
+ dynmailerp = pp[i];
+ if (tTd(25, 8))
+ sm_dprintf("dynmailerp=%c\n", dynmailerp);
+ return;
+ }
+ }
+
+ /* NOTREACHED */
+ SM_ASSERT(0);
+}
+
+/*
+** NEWMODMAILER -- Create a new mailer with modifications
+**
+** Parameters:
+** rcpt -- current RCPT
+** fl -- flag to set
+**
+** Returns:
+** true iff successful.
+**
+** Note: this creates a copy of the mailer for the rcpt and
+** modifies exactly one flag. It does not work
+** for multiple flags!
+*/
+
+bool
+newmodmailer(rcpt, fl)
+ ADDRESS *rcpt;
+ int fl;
+{
+ int idx;
+ struct mailer *m;
+ STAB *s;
+ char mname[256];
+
+ SM_REQUIRE(rcpt != NULL);
+ if (rcpt->q_mailer == NULL)
+ return false;
+ if (tTd(25, 8))
+ sm_dprintf("newmodmailer: rcpt=%s\n", rcpt->q_paddr);
+ SM_REQUIRE(rcpt->q_mailer->m_name != NULL);
+ SM_REQUIRE(rcpt->q_mailer->m_name[0] != '\0');
+ sm_strlcpy(mname, rcpt->q_mailer->m_name, sizeof(mname));
+ mname[0] = dynmailerp;
+ if (tTd(25, 8))
+ sm_dprintf("newmodmailer: name=%s\n", mname);
+ s = stab(mname, ST_MAILER, ST_ENTER);
+ if (s->s_mailer != NULL)
+ {
+ idx = s->s_mailer->m_mno;
+ if (tTd(25, 6))
+ sm_dprintf("newmodmailer: found idx=%d\n", idx);
+ }
+ else
+ {
+ idx = rcpt->q_mailer->m_mno;
+ idx += MAXMAILERS;
+ if (tTd(25, 6))
+ sm_dprintf("newmodmailer: idx=%d\n", idx);
+ if (idx > SM_ARRAY_SIZE(Mailer))
+ return false;
+ }
+
+ m = Mailer[idx];
+ if (m == NULL)
+ m = (struct mailer *) xalloc(sizeof(*m));
+ memset((char *) m, '\0', sizeof(*m));
+ STRUCTCOPY(*rcpt->q_mailer, *m);
+ Mailer[idx] = m;
+
+ /* "modify" the mailer */
+ setbitn(bitidx(fl), m->m_flags);
+ rcpt->q_mailer = m;
+ m->m_mno = idx;
+ m->m_name = newstr(mname);
+ if (tTd(25, 1))
+ sm_dprintf("newmodmailer: mailer[%d]=%s %p\n",
+ idx, Mailer[idx]->m_name, Mailer[idx]);
+
+ return true;
+}
+
+#endif /* _FFR_RCPTFLAGS */
+
+/*
** MAKEMAILER -- define a new mailer.
**
** Parameters:
@@ -1203,6 +1377,7 @@
** enters the mailer into the mailer table.
*/
+
void
makemailer(line)
char *line;
@@ -1233,6 +1408,9 @@
return;
}
m->m_name = newstr(line);
+#if _FFR_RCPTFLAGS
+ frst[nextmailer] = line[0];
+#endif
m->m_qgrp = NOQGRP;
m->m_uid = NO_UID;
m->m_gid = NO_GID;
@@ -1274,12 +1452,10 @@
{
if (!(isascii(*p) && isspace(*p)))
{
-#if _FFR_DEPRECATE_MAILER_FLAG_I
if (*p == M_INTERNAL)
sm_syslog(LOG_WARNING, NOQID,
"WARNING: mailer=%s, flag=%c deprecated",
m->m_name, *p);
-#endif /* _FFR_DEPRECATE_MAILER_FLAG_I */
setbitn(bitidx(*p), m->m_flags);
}
}
@@ -1411,7 +1587,11 @@
struct passwd *pw;
while (*p != '\0' && isascii(*p) &&
+# if _FFR_DOTTED_USERNAMES
+ (isalnum(*p) || strchr(SM_PWN_CHARS, *p) != NULL))
+# else /* _FFR_DOTTED_USERNAMES */
(isalnum(*p) || strchr("-_", *p) != NULL))
+# endif /* _FFR_DOTTED_USERNAMES */
p++;
while (isascii(*p) && isspace(*p))
*p++ = '\0';
@@ -1455,7 +1635,8 @@
char *q = p;
struct group *gr;
- while (isascii(*p) && isalnum(*p))
+ while (isascii(*p) &&
+ (isalnum(*p) || strchr(SM_PWN_CHARS, *p) != NULL))
p++;
*p++ = '\0';
if (*q == '\0')
@@ -1934,7 +2115,440 @@
}
(void) sm_io_fprintf(fp, SM_TIME_DEFAULT, "\n");
}
+
+#if STARTTLS
+static struct ssl_options
+{
+ const char *sslopt_name; /* name of the flag */
+ long sslopt_bits; /* bits to set/clear */
+} SSL_Option[] =
+{
+/* Workaround for bugs are turned on by default (as well as some others) */
+#ifdef SSL_OP_MICROSOFT_SESS_ID_BUG
+ { "SSL_OP_MICROSOFT_SESS_ID_BUG", SSL_OP_MICROSOFT_SESS_ID_BUG },
+#endif
+#ifdef SSL_OP_NETSCAPE_CHALLENGE_BUG
+ { "SSL_OP_NETSCAPE_CHALLENGE_BUG", SSL_OP_NETSCAPE_CHALLENGE_BUG },
+#endif
+#ifdef SSL_OP_LEGACY_SERVER_CONNECT
+ { "SSL_OP_LEGACY_SERVER_CONNECT", SSL_OP_LEGACY_SERVER_CONNECT },
+#endif
+#ifdef SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG
+ { "SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG", SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG },
+#endif
+#ifdef SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG
+ { "SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG", SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG },
+#endif
+#ifdef SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER
+ { "SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER", SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER },
+#endif
+#ifdef SSL_OP_MSIE_SSLV2_RSA_PADDING
+ { "SSL_OP_MSIE_SSLV2_RSA_PADDING", SSL_OP_MSIE_SSLV2_RSA_PADDING },
+#endif
+#ifdef SSL_OP_SSLEAY_080_CLIENT_DH_BUG
+ { "SSL_OP_SSLEAY_080_CLIENT_DH_BUG", SSL_OP_SSLEAY_080_CLIENT_DH_BUG },
+#endif
+#ifdef SSL_OP_TLS_D5_BUG
+ { "SSL_OP_TLS_D5_BUG", SSL_OP_TLS_D5_BUG },
+#endif
+#ifdef SSL_OP_TLS_BLOCK_PADDING_BUG
+ { "SSL_OP_TLS_BLOCK_PADDING_BUG", SSL_OP_TLS_BLOCK_PADDING_BUG },
+#endif
+#ifdef SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS
+ { "SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS", SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS },
+#endif
+#ifdef SSL_OP_ALL
+ { "SSL_OP_ALL", SSL_OP_ALL },
+#endif
+#ifdef SSL_OP_NO_QUERY_MTU
+ { "SSL_OP_NO_QUERY_MTU", SSL_OP_NO_QUERY_MTU },
+#endif
+#ifdef SSL_OP_COOKIE_EXCHANGE
+ { "SSL_OP_COOKIE_EXCHANGE", SSL_OP_COOKIE_EXCHANGE },
+#endif
+#ifdef SSL_OP_NO_TICKET
+ { "SSL_OP_NO_TICKET", SSL_OP_NO_TICKET },
+#endif
+#ifdef SSL_OP_CISCO_ANYCONNECT
+ { "SSL_OP_CISCO_ANYCONNECT", SSL_OP_CISCO_ANYCONNECT },
+#endif
+#ifdef SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION
+ { "SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION", SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION },
+#endif
+#ifdef SSL_OP_NO_COMPRESSION
+ { "SSL_OP_NO_COMPRESSION", SSL_OP_NO_COMPRESSION },
+#endif
+#ifdef SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION
+ { "SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION", SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION },
+#endif
+#ifdef SSL_OP_SINGLE_ECDH_USE
+ { "SSL_OP_SINGLE_ECDH_USE", SSL_OP_SINGLE_ECDH_USE },
+#endif
+#ifdef SSL_OP_SINGLE_DH_USE
+ { "SSL_OP_SINGLE_DH_USE", SSL_OP_SINGLE_DH_USE },
+#endif
+#ifdef SSL_OP_EPHEMERAL_RSA
+ { "SSL_OP_EPHEMERAL_RSA", SSL_OP_EPHEMERAL_RSA },
+#endif
+#ifdef SSL_OP_CIPHER_SERVER_PREFERENCE
+ { "SSL_OP_CIPHER_SERVER_PREFERENCE", SSL_OP_CIPHER_SERVER_PREFERENCE },
+#endif
+#ifdef SSL_OP_TLS_ROLLBACK_BUG
+ { "SSL_OP_TLS_ROLLBACK_BUG", SSL_OP_TLS_ROLLBACK_BUG },
+#endif
+#ifdef SSL_OP_NO_SSLv2
+ { "SSL_OP_NO_SSLv2", SSL_OP_NO_SSLv2 },
+#endif
+#ifdef SSL_OP_NO_SSLv3
+ { "SSL_OP_NO_SSLv3", SSL_OP_NO_SSLv3 },
+#endif
+#ifdef SSL_OP_NO_TLSv1
+ { "SSL_OP_NO_TLSv1", SSL_OP_NO_TLSv1 },
+#endif
+#ifdef SSL_OP_NO_TLSv1_2
+ { "SSL_OP_NO_TLSv1_2", SSL_OP_NO_TLSv1_2 },
+#endif
+#ifdef SSL_OP_NO_TLSv1_1
+ { "SSL_OP_NO_TLSv1_1", SSL_OP_NO_TLSv1_1 },
+#endif
+#ifdef SSL_OP_PKCS1_CHECK_1
+ { "SSL_OP_PKCS1_CHECK_1", SSL_OP_PKCS1_CHECK_1 },
+#endif
+#ifdef SSL_OP_PKCS1_CHECK_2
+ { "SSL_OP_PKCS1_CHECK_2", SSL_OP_PKCS1_CHECK_2 },
+#endif
+#ifdef SSL_OP_NETSCAPE_CA_DN_BUG
+ { "SSL_OP_NETSCAPE_CA_DN_BUG", SSL_OP_NETSCAPE_CA_DN_BUG },
+#endif
+#ifdef SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG
+ { "SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG", SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG },
+#endif
+#ifdef SSL_OP_CRYPTOPRO_TLSEXT_BUG
+ { "SSL_OP_CRYPTOPRO_TLSEXT_BUG", SSL_OP_CRYPTOPRO_TLSEXT_BUG },
+#endif
+#ifdef SSL_OP_TLSEXT_PADDING
+ { "SSL_OP_TLSEXT_PADDING", SSL_OP_TLSEXT_PADDING },
+#endif
+ { NULL, 0 }
+};
+
/*
+** READSSLOPTIONS -- read SSL_OP_* values
+**
+** Parameters:
+** opt -- name of option (can be NULL)
+** val -- string with SSL_OP_* values or hex value
+** delim -- end of string (e.g., '\0' or ';')
+** pssloptions -- return value (output)
+**
+** Returns:
+** 0 on success.
+*/
+
+#define SSLOPERR_NAN 1
+#define SSLOPERR_NOTFOUND 2
+#define SM_ISSPACE(c) (isascii(c) && isspace(c))
+
+static int
+readssloptions(opt, val, pssloptions, delim)
+ char *opt;
+ char *val;
+ unsigned long *pssloptions;
+ int delim;
+{
+ char *p;
+ int ret;
+
+ ret = 0;
+ for (p = val; *p != '\0' && *p != delim; )
+ {
+ bool clearmode;
+ char *q;
+ unsigned long sslopt_val;
+ struct ssl_options *sslopts;
+
+ while (*p == ' ')
+ p++;
+ if (*p == '\0')
+ break;
+ clearmode = false;
+ if (*p == '-' || *p == '+')
+ clearmode = *p++ == '-';
+ q = p;
+ while (*p != '\0' && !(SM_ISSPACE(*p)) && *p != ',')
+ p++;
+ if (*p != '\0')
+ *p++ = '\0';
+ sslopt_val = 0;
+ if (isdigit(*q))
+ {
+ char *end;
+
+ sslopt_val = strtoul(q, &end, 0);
+
+ /* not a complete "syntax" check but good enough */
+ if (end == q)
+ {
+ errno = 0;
+ ret = SSLOPERR_NAN;
+ if (opt != NULL)
+ syserr("readcf: %s option value %s not a number",
+ opt, q);
+ sslopt_val = 0;
+ }
+ }
+ else
+ {
+ for (sslopts = SSL_Option;
+ sslopts->sslopt_name != NULL; sslopts++)
+ {
+ if (sm_strcasecmp(q, sslopts->sslopt_name) == 0)
+ {
+ sslopt_val = sslopts->sslopt_bits;
+ break;
+ }
+ }
+ if (sslopts->sslopt_name == NULL)
+ {
+ errno = 0;
+ ret = SSLOPERR_NOTFOUND;
+ if (opt != NULL)
+ syserr("readcf: %s option value %s unrecognized",
+ opt, q);
+ }
+ }
+ if (sslopt_val != 0)
+ {
+ if (clearmode)
+ *pssloptions &= ~sslopt_val;
+ else
+ *pssloptions |= sslopt_val;
+ }
+ }
+ return ret;
+}
+
+# if _FFR_TLS_SE_OPTS
+/*
+** GET_TLS_SE_OPTIONS -- get TLS session options (from ruleset)
+**
+** Parameters:
+** e -- envelope
+** ssl -- TLS session context
+** srv -- server?
+**
+** Returns:
+** 0 on success.
+*/
+
+int
+get_tls_se_options(e, ssl, srv)
+ ENVELOPE *e;
+ SSL *ssl;
+ bool srv;
+{
+ bool saveQuickAbort, saveSuprErrs, ok;
+ char *optionlist, *opt, *val;
+ char *keyfile, *certfile;
+ size_t len, i;
+ int ret;
+
+# define who (srv ? "server" : "client")
+# define NAME_C_S macvalue(macid(srv ? "{client_name}" : "{server_name}"), e)
+# define ADDR_C_S macvalue(macid(srv ? "{client_addr}" : "{server_addr}"), e)
+# define WHICH srv ? "srv" : "clt"
+
+ ret = 0;
+ keyfile = certfile = opt = val = NULL;
+ saveQuickAbort = QuickAbort;
+ saveSuprErrs = SuprErrs;
+ SuprErrs = true;
+ QuickAbort = false;
+
+ optionlist = NULL;
+ ok = rscheck(srv ? "tls_srv_features" : "tls_clt_features",
+ NAME_C_S, ADDR_C_S, e,
+ RSF_RMCOMM|RSF_ADDR|RSF_STRING,
+ 5, NULL, NOQID, NULL, &optionlist) == EX_OK;
+ if (!ok && LogLevel > 8)
+ {
+ sm_syslog(LOG_NOTICE, NOQID,
+ "rscheck(tls_%s_features)=failed, relay=%s [%s], errors=%d",
+ WHICH, NAME_C_S, ADDR_C_S,
+ Errors);
+ }
+ QuickAbort = saveQuickAbort;
+ SuprErrs = saveSuprErrs;
+ if (ok && LogLevel > 9)
+ {
+ sm_syslog(LOG_INFO, NOQID,
+ "tls_%s_features=%s, relay=%s [%s]",
+ WHICH, optionlist, NAME_C_S, ADDR_C_S);
+ }
+ if (!ok || optionlist == NULL || (len = strlen(optionlist)) < 2)
+ {
+ if (LogLevel > 9)
+ sm_syslog(LOG_INFO, NOQID,
+ "tls_%s_features=empty, relay=%s [%s]",
+ WHICH, NAME_C_S, ADDR_C_S);
+
+ return ok ? 0 : 1;
+ }
+
+ i = 0;
+ if (optionlist[0] == '"' && optionlist[len - 1] == '"')
+ {
+ optionlist[0] = ' ';
+ optionlist[--len] = '\0';
+ if (len <= 2)
+ {
+ if (LogLevel > 9 && len > 1)
+ sm_syslog(LOG_INFO, NOQID,
+ "tls_%s_features=too_short, relay=%s [%s]",
+ WHICH, NAME_C_S, ADDR_C_S);
+
+ /* this is not treated as error! */
+ return 0;
+ }
+ i = 1;
+ }
+
+# define INVALIDSYNTAX \
+ do { \
+ if (LogLevel > 7) \
+ sm_syslog(LOG_INFO, NOQID, \
+ "tls_%s_features=invalid_syntax, opt=%s, relay=%s [%s]", \
+ WHICH, opt, NAME_C_S, ADDR_C_S); \
+ return -1; \
+ } while (0)
+
+# define CHECKLEN \
+ do { \
+ if (i >= len) \
+ INVALIDSYNTAX; \
+ } while (0)
+
+# define SKIPWS \
+ do { \
+ while (i < len && SM_ISSPACE(optionlist[i])) \
+ ++i; \
+ CHECKLEN; \
+ } while (0)
+
+ /* parse and handle opt=val; */
+ do {
+ char sep;
+
+ SKIPWS;
+ opt = optionlist + i;
+ sep = '=';
+ while (i < len && optionlist[i] != sep
+ && optionlist[i] != '\0' && !SM_ISSPACE(optionlist[i]))
+ ++i;
+ CHECKLEN;
+ while (i < len && SM_ISSPACE(optionlist[i]))
+ optionlist[i++] = '\0';
+ CHECKLEN;
+ if (optionlist[i] != sep)
+ INVALIDSYNTAX;
+ optionlist[i++] = '\0';
+
+ SKIPWS;
+ val = optionlist + i;
+ sep = ';';
+ while (i < len && optionlist[i] != sep && optionlist[i] != '\0')
+ ++i;
+ if (optionlist[i] != '\0')
+ {
+ CHECKLEN;
+ optionlist[i++] = '\0';
+ }
+
+ if (LogLevel > 13)
+ sm_syslog(LOG_DEBUG, NOQID,
+ "tls_%s_features=parsed, %s=%s, relay=%s [%s]",
+ WHICH, opt, val, NAME_C_S, ADDR_C_S);
+
+ if (sm_strcasecmp(opt, "options") == 0)
+ {
+ unsigned long ssloptions;
+
+ ssloptions = 0;
+ ret = readssloptions(NULL, val, &ssloptions, ';');
+ if (ret == 0)
+ (void) SSL_set_options(ssl, (long) ssloptions);
+ else if (LogLevel > 8)
+ {
+ sm_syslog(LOG_WARNING, NOQID,
+ "tls_%s_features=%s, error=%s, relay=%s [%s]",
+ WHICH, val,
+ (ret == SSLOPERR_NAN) ? "not a number" :
+ ((ret == SSLOPERR_NOTFOUND) ? "SSL_OP not found" :
+ "unknown"),
+ NAME_C_S, ADDR_C_S);
+ }
+ }
+ else if (sm_strcasecmp(opt, "cipherlist") == 0)
+ {
+ if (SSL_set_cipher_list(ssl, val) <= 0)
+ {
+ ret = 1;
+ if (LogLevel > 7)
+ {
+ sm_syslog(LOG_WARNING, NOQID,
+ "STARTTLS=%s, error: SSL_set_cipher_list(%s) failed",
+ who, val);
+
+ if (LogLevel > 9)
+ tlslogerr(LOG_WARNING, who);
+ }
+ }
+ }
+ else if (sm_strcasecmp(opt, "keyfile") == 0)
+ keyfile = val;
+ else if (sm_strcasecmp(opt, "certfile") == 0)
+ certfile = val;
+ else
+ {
+ ret = 1;
+ if (LogLevel > 7)
+ {
+ sm_syslog(LOG_INFO, NOQID,
+ "tls_%s_features=unknown_option, opt=%s, relay=%s [%s]",
+ WHICH, opt, NAME_C_S, ADDR_C_S);
+ }
+ }
+
+ } while (optionlist[i] != '\0' && i < len);
+
+ /* need cert and key before we can use the options */
+ /* does not implement the "," hack for 2nd cert/key pair */
+ if (keyfile != NULL && certfile != NULL)
+ {
+ load_certkey(ssl, srv, certfile, keyfile);
+ keyfile = certfile = NULL;
+ }
+ else if (keyfile != NULL || certfile != NULL)
+ {
+ ret = 1;
+ if (LogLevel > 7)
+ {
+ sm_syslog(LOG_INFO, NOQID,
+ "tls_%s_features=only_one_of_CertFile/KeyFile_specified, relay=%s [%s]",
+ WHICH, NAME_C_S, ADDR_C_S);
+ }
+ }
+
+ return ret;
+# undef who
+# undef NAME_C_S
+# undef ADDR_C_S
+# undef WHICH
+}
+# endif /* _FFR_TLS_SE_OPTS */
+#endif /* STARTTLS */
+
+/*
** SETOPTION -- set global processing option
**
** Parameters:
@@ -2175,12 +2789,10 @@
{ "AuthOptions", O_SASLOPTS, OI_NONE },
#define O_QUEUE_FILE_MODE 0xbe
{ "QueueFileMode", O_QUEUE_FILE_MODE, OI_NONE },
-#if _FFR_TLS_1
-# define O_DHPARAMS5 0xbf
- { "DHParameters512", O_DHPARAMS5, OI_NONE },
-# define O_CIPHERLIST 0xc0
+#define O_DIG_ALG 0xbf
+ { "CertFingerprintAlgorithm", O_DIG_ALG, OI_NONE },
+#define O_CIPHERLIST 0xc0
{ "CipherList", O_CIPHERLIST, OI_NONE },
-#endif /* _FFR_TLS_1 */
#define O_RANDFILE 0xc1
{ "RandFile", O_RANDFILE, OI_NONE },
#define O_TLS_SRV_OPTS 0xc2
@@ -2266,16 +2878,12 @@
# define O_RCPTSHUTDG 0xe2
{ "BadRcptShutdownGood", O_RCPTSHUTDG, OI_SAFE },
#endif /* _FFR_BADRCPT_SHUTDOWN */
-#if STARTTLS && _FFR_TLS_1
-# define O_SRV_SSL_OPTIONS 0xe3
+#define O_SRV_SSL_OPTIONS 0xe3
{ "ServerSSLOptions", O_SRV_SSL_OPTIONS, OI_NONE },
-# define O_CLT_SSL_OPTIONS 0xe4
+#define O_CLT_SSL_OPTIONS 0xe4
{ "ClientSSLOptions", O_CLT_SSL_OPTIONS, OI_NONE },
-#endif /* STARTTLS && _FFR_TLS_1 */
-#if _FFR_EXPDELAY
-# define O_MAX_QUEUE_AGE 0xe5
+#define O_MAX_QUEUE_AGE 0xe5
{ "MaxQueueAge", O_MAX_QUEUE_AGE, OI_NONE },
-#endif /* _FFR_EXPDELAY */
#if _FFR_RCPTTHROTDELAY
# define O_RCPTTHROTDELAY 0xe6
{ "BadRcptThrottleDelay", O_RCPTTHROTDELAY, OI_SAFE },
@@ -2292,104 +2900,20 @@
# define O_REJECTNUL 0xe9
{ "RejectNUL", O_REJECTNUL, OI_SAFE },
#endif /* _FFR_REJECT_NUL_BYTE */
+#if _FFR_BOUNCE_QUEUE
+# define O_BOUNCEQUEUE 0xea
+ { "BounceQueue", O_BOUNCEQUEUE, OI_NONE },
+#endif /* _FFR_BOUNCE_QUEUE */
+#if _FFR_ADD_BCC
+# define O_ADDBCC 0xeb
+ { "AddBcc", O_ADDBCC, OI_NONE },
+#endif
+#define O_USECOMPRESSEDIPV6ADDRESSES 0xec
+ { "UseCompressedIPv6Addresses", O_USECOMPRESSEDIPV6ADDRESSES, OI_NONE },
{ NULL, '\0', OI_NONE }
};
-#if STARTTLS && _FFR_TLS_1
-static struct ssl_options
-{
- const char *sslopt_name; /* name of the flag */
- long sslopt_bits; /* bits to set/clear */
-} SSL_Option[] =
-{
-/* these are turned on by default */
-#ifdef SSL_OP_MICROSOFT_SESS_ID_BUG
- { "SSL_OP_MICROSOFT_SESS_ID_BUG", SSL_OP_MICROSOFT_SESS_ID_BUG },
-#endif
-#ifdef SSL_OP_NETSCAPE_CHALLENGE_BUG
- { "SSL_OP_NETSCAPE_CHALLENGE_BUG", SSL_OP_NETSCAPE_CHALLENGE_BUG },
-#endif
-#ifdef SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG
- { "SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG", SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG },
-#endif
-#ifdef SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG
- { "SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG", SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG },
-#endif
-#ifdef SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER
- { "SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER", SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER },
-#endif
-#ifdef SSL_OP_MSIE_SSLV2_RSA_PADDING
- { "SSL_OP_MSIE_SSLV2_RSA_PADDING", SSL_OP_MSIE_SSLV2_RSA_PADDING },
-#endif
-#ifdef SSL_OP_SSLEAY_080_CLIENT_DH_BUG
- { "SSL_OP_SSLEAY_080_CLIENT_DH_BUG", SSL_OP_SSLEAY_080_CLIENT_DH_BUG },
-#endif
-#ifdef SSL_OP_TLS_D5_BUG
- { "SSL_OP_TLS_D5_BUG", SSL_OP_TLS_D5_BUG },
-#endif
-#ifdef SSL_OP_TLS_BLOCK_PADDING_BUG
- { "SSL_OP_TLS_BLOCK_PADDING_BUG", SSL_OP_TLS_BLOCK_PADDING_BUG },
-#endif
-#ifdef SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS
- { "SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS", SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS },
-#endif
-#ifdef SSL_OP_ALL
- { "SSL_OP_ALL", SSL_OP_ALL },
-#endif
-#ifdef SSL_OP_NO_QUERY_MTU
- { "SSL_OP_NO_QUERY_MTU", SSL_OP_NO_QUERY_MTU },
-#endif
-#ifdef SSL_OP_COOKIE_EXCHANGE
- { "SSL_OP_COOKIE_EXCHANGE", SSL_OP_COOKIE_EXCHANGE },
-#endif
-#ifdef SSL_OP_NO_TICKET
- { "SSL_OP_NO_TICKET", SSL_OP_NO_TICKET },
-#endif
-#ifdef SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION
- { "SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION", SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION },
-#endif
-#ifdef SSL_OP_SINGLE_ECDH_USE
- { "SSL_OP_SINGLE_ECDH_USE", SSL_OP_SINGLE_ECDH_USE },
-#endif
-#ifdef SSL_OP_SINGLE_DH_USE
- { "SSL_OP_SINGLE_DH_USE", SSL_OP_SINGLE_DH_USE },
-#endif
-#ifdef SSL_OP_EPHEMERAL_RSA
- { "SSL_OP_EPHEMERAL_RSA", SSL_OP_EPHEMERAL_RSA },
-#endif
-#ifdef SSL_OP_CIPHER_SERVER_PREFERENCE
- { "SSL_OP_CIPHER_SERVER_PREFERENCE", SSL_OP_CIPHER_SERVER_PREFERENCE },
-#endif
-#ifdef SSL_OP_TLS_ROLLBACK_BUG
- { "SSL_OP_TLS_ROLLBACK_BUG", SSL_OP_TLS_ROLLBACK_BUG },
-#endif
-#ifdef SSL_OP_NO_SSLv2
- { "SSL_OP_NO_SSLv2", SSL_OP_NO_SSLv2 },
-#endif
-#ifdef SSL_OP_NO_SSLv3
- { "SSL_OP_NO_SSLv3", SSL_OP_NO_SSLv3 },
-#endif
-#ifdef SSL_OP_NO_TLSv1
- { "SSL_OP_NO_TLSv1", SSL_OP_NO_TLSv1 },
-#endif
-#ifdef SSL_OP_PKCS1_CHECK_1
- { "SSL_OP_PKCS1_CHECK_1", SSL_OP_PKCS1_CHECK_1 },
-#endif
-#ifdef SSL_OP_PKCS1_CHECK_2
- { "SSL_OP_PKCS1_CHECK_2", SSL_OP_PKCS1_CHECK_2 },
-#endif
-#ifdef SSL_OP_NETSCAPE_CA_DN_BUG
- { "SSL_OP_NETSCAPE_CA_DN_BUG", SSL_OP_NETSCAPE_CA_DN_BUG },
-#endif
-#ifdef SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG
- { "SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG", SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG },
-#endif
- { NULL, 0 }
-};
-#endif /* STARTTLS && _FFR_TLS_1 */
-
-
# define CANONIFY(val)
# define SET_OPT_DEFAULT(opt, val) opt = val
@@ -2430,9 +2954,9 @@
char *newval;
char exbuf[MAXLINE];
#endif /* STARTTLS || SM_CONF_SHM */
-#if STARTTLS && _FFR_TLS_1
- long *pssloptions = NULL;
-#endif /* STARTTLS && _FFR_TLS_1 */
+#if STARTTLS
+ unsigned long *pssloptions = NULL;
+#endif
errno = 0;
if (opt == ' ')
@@ -2677,6 +3201,11 @@
set_delivery_mode(*val, e);
break;
+#if _FFR_PROXY
+ case SM_PROXY_REQ:
+ set_delivery_mode(*val, e);
+ break;
+#endif /* _FFR_PROXY */
default:
syserr("Unknown delivery mode %c", *val);
@@ -3130,11 +3659,9 @@
MinQueueAge = convtime(val, 'm');
break;
-#if _FFR_EXPDELAY
case O_MAX_QUEUE_AGE:
MaxQueueAge = convtime(val, 'm');
break;
-#endif /* _FFR_EXPDELAY */
case O_DEFCHARSET: /* default character set for mimefying */
DefaultCharSet = newstr(denlstring(val, true, true));
@@ -3349,9 +3876,9 @@
RunAsGid = pw->pw_gid;
else if (UseMSP && *p == '\0')
(void) sm_io_fprintf(smioout, SM_TIME_DEFAULT,
- "WARNING: RunAsUser for MSP ignored, check group ids (egid=%d, want=%d)\n",
- (int) EffGid,
- (int) pw->pw_gid);
+ "WARNING: RunAsUser for MSP ignored, check group ids (egid=%ld, want=%ld)\n",
+ (long) EffGid,
+ (long) pw->pw_gid);
}
# ifdef UID_MAX
if (RunAsUid > UID_MAX)
@@ -3373,9 +3900,9 @@
else if (UseMSP)
(void) sm_io_fprintf(smioout,
SM_TIME_DEFAULT,
- "WARNING: RunAsUser for MSP ignored, check group ids (egid=%d, want=%d)\n",
- (int) EffGid,
- (int) runasgid);
+ "WARNING: RunAsUser for MSP ignored, check group ids (egid=%ld, want=%ld)\n",
+ (long) EffGid,
+ (long) runasgid);
}
else
{
@@ -3390,9 +3917,9 @@
else if (UseMSP)
(void) sm_io_fprintf(smioout,
SM_TIME_DEFAULT,
- "WARNING: RunAsUser for MSP ignored, check group ids (egid=%d, want=%d)\n",
- (int) EffGid,
- (int) gr->gr_gid);
+ "WARNING: RunAsUser for MSP ignored, check group ids (egid=%ld, want=%ld)\n",
+ (long) EffGid,
+ (long) gr->gr_gid);
}
}
if (tTd(47, 5))
@@ -3720,56 +4247,22 @@
SET_STRING_EXP(CACertPath);
case O_DHPARAMS:
SET_STRING_EXP(DHParams);
-# if _FFR_TLS_1
- case O_DHPARAMS5:
- SET_STRING_EXP(DHParams5);
case O_CIPHERLIST:
SET_STRING_EXP(CipherList);
+ case O_DIG_ALG:
+ SET_STRING_EXP(CertFingerprintAlgorithm);
case O_SRV_SSL_OPTIONS:
pssloptions = &Srv_SSL_Options;
case O_CLT_SSL_OPTIONS:
if (pssloptions == NULL)
pssloptions = &Clt_SSL_Options;
- for (p = val; *p != 0; )
- {
- bool clearmode;
- char *q;
- struct ssl_options *sslopts;
+ (void) readssloptions(o->o_name, val, pssloptions, '\0');
+ if (tTd(37, 8))
+ sm_dprintf("ssloptions=%#lx\n", *pssloptions);
- while (*p == ' ')
- p++;
- if (*p == '\0')
- break;
- clearmode = false;
- if (*p == '-' || *p == '+')
- clearmode = *p++ == '-';
- q = p;
- while (*p != '\0' && !(isascii(*p) && isspace(*p)))
- p++;
- if (*p != '\0')
- *p++ = '\0';
- for (sslopts = SSL_Option;
- sslopts->sslopt_name != NULL; sslopts++)
- {
- if (sm_strcasecmp(q, sslopts->sslopt_name) == 0)
- break;
- }
- if (sslopts->sslopt_name == NULL)
- {
- errno = 0;
- syserr("readcf: %s option value %s unrecognized",
- o->o_name, q);
- }
- else if (clearmode)
- *pssloptions &= ~sslopts->sslopt_bits;
- else
- *pssloptions |= sslopts->sslopt_bits;
- }
pssloptions = NULL;
break;
-# endif /* _FFR_TLS_1 */
-
case O_CRLFILE:
# if OPENSSL_VERSION_NUMBER > 0x00907000L
SET_STRING_EXP(CRLFile);
@@ -3810,7 +4303,6 @@
case 'V':
TLS_Srv_Opts |= TLS_I_NO_VRFY;
break;
-# if _FFR_TLS_1
/*
** Server without a cert? That works only if
** AnonDH is enabled as cipher, which is not in the
@@ -3822,7 +4314,6 @@
case 'C':
TLS_Srv_Opts &= ~TLS_I_SRV_CERT;
break;
-# endif /* _FFR_TLS_1 */
case ' ': /* ignore */
case '\t': /* ignore */
case ',': /* ignore */
@@ -3855,10 +4346,9 @@
case O_CACERTFILE:
case O_CACERTPATH:
case O_DHPARAMS:
-# if _FFR_TLS_1
- case O_DHPARAMS5:
+ case O_SRV_SSL_OPTIONS:
+ case O_CLT_SSL_OPTIONS:
case O_CIPHERLIST:
-# endif /* _FFR_TLS_1 */
case O_CRLFILE:
# if _FFR_CRLPATH
case O_CRLPATH:
@@ -4035,6 +4525,21 @@
break;
#endif /* _FFR_REJECT_NUL_BYTE */
+#if _FFR_BOUNCE_QUEUE
+ case O_BOUNCEQUEUE:
+ bouncequeue = newstr(val);
+ break;
+#endif /* _FFR_BOUNCE_QUEUE */
+
+#if _FFR_ADD_BCC
+ case O_ADDBCC:
+ AddBcc = atobool(val);
+ break;
+#endif
+ case O_USECOMPRESSEDIPV6ADDRESSES:
+ UseCompressedIPv6Addresses = atobool(val);
+ break;
+
default:
if (tTd(37, 1))
{
Modified: stable/0.8/contrib/sendmail/src/recipient.c
===================================================================
--- stable/0.8/contrib/sendmail/src/recipient.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/recipient.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2003, 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2003, 2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: recipient.c,v 1.1.1.4 2013-08-14 22:35:48 laffer1 Exp $")
+SM_RCSID("@(#)$Id: recipient.c,v 8.351 2013-11-22 20:51:56 ca Exp $")
static void includetimeout __P((int));
static ADDRESS *self_reference __P((ADDRESS *));
@@ -667,8 +667,8 @@
new->q_status = "5.7.1";
if (new->q_alias->q_ruser == NULL)
usrerrenh(new->q_status,
- "550 UID %d is an unknown user: cannot mail to programs",
- new->q_alias->q_uid);
+ "550 UID %ld is an unknown user: cannot mail to programs",
+ (long) new->q_alias->q_uid);
else
usrerrenh(new->q_status,
"550 User %s@%s doesn't have a valid shell for mailing to programs",
@@ -890,8 +890,8 @@
new->q_status = "5.7.1";
if (new->q_alias->q_ruser == NULL)
usrerrenh(new->q_status,
- "550 UID %d is an unknown user: cannot mail to files",
- new->q_alias->q_uid);
+ "550 UID %ld is an unknown user: cannot mail to files",
+ (long) new->q_alias->q_uid);
else
usrerrenh(new->q_status,
"550 User %s@%s doesn't have a valid shell for mailing to files",
@@ -1174,7 +1174,7 @@
*fuzzyp = false;
-#if HESIOD
+#if HESIOD && !HESIOD_ALLOW_NUMERIC_LOGIN
/* DEC Hesiod getpwnam accepts numeric strings -- short circuit it */
for (p = name; *p != '\0'; p++)
if (!isascii(*p) || !isdigit(*p))
@@ -1185,7 +1185,7 @@
sm_dprintf("failed (numeric input)\n");
return EX_NOUSER;
}
-#endif /* HESIOD */
+#endif /* HESIOD && !HESIOD_ALLOW_NUMERIC_LOGIN */
/* look up this login name using fast path */
status = sm_mbdb_lookup(name, user);
@@ -1446,8 +1446,8 @@
if (tTd(27, 2))
sm_dprintf("include(%s)\n", fname);
if (tTd(27, 4))
- sm_dprintf(" ruid=%d euid=%d\n",
- (int) getuid(), (int) geteuid());
+ sm_dprintf(" ruid=%ld euid=%ld\n",
+ (long) getuid(), (long) geteuid());
if (tTd(27, 14))
{
sm_dprintf("ctladdr ");
@@ -1455,8 +1455,8 @@
}
if (tTd(27, 9))
- sm_dprintf("include: old uid = %d/%d\n",
- (int) getuid(), (int) geteuid());
+ sm_dprintf("include: old uid = %ld/%ld\n",
+ (long) getuid(), (long) geteuid());
if (forwarding)
{
@@ -1483,8 +1483,8 @@
!bitnset(DBS_NONROOTSAFEADDR, DontBlameSendmail))
{
if (tTd(27, 4))
- sm_dprintf("include: not safe (euid=%d, RunAsUid=%d)\n",
- (int) geteuid(), (int) RunAsUid);
+ sm_dprintf("include: not safe (euid=%ld, RunAsUid=%ld)\n",
+ (long) geteuid(), (long) RunAsUid);
ctladdr->q_flags |= QUNSAFEADDR;
}
@@ -1512,8 +1512,8 @@
if (initgroups(user, gid) == -1)
{
rval = EAGAIN;
- syserr("include: initgroups(%s, %d) failed",
- user, gid);
+ syserr("include: initgroups(%s, %ld) failed",
+ user, (long) gid);
goto resetuid;
}
}
@@ -1533,7 +1533,7 @@
if (gid != 0 && setgid(gid) < -1)
{
rval = EAGAIN;
- syserr("setgid(%d) failure", gid);
+ syserr("setgid(%ld) failure", (long) gid);
goto resetuid;
}
if (uid != 0)
@@ -1542,8 +1542,8 @@
if (seteuid(uid) < 0)
{
rval = EAGAIN;
- syserr("seteuid(%d) failure (real=%d, eff=%d)",
- uid, (int) getuid(), (int) geteuid());
+ syserr("seteuid(%ld) failure (real=%ld, eff=%ld)",
+ (long) uid, (long) getuid(), (long) geteuid());
goto resetuid;
}
# endif /* MAILER_SETUID_METHOD == USE_SETEUID */
@@ -1551,8 +1551,8 @@
if (setreuid(0, uid) < 0)
{
rval = EAGAIN;
- syserr("setreuid(0, %d) failure (real=%d, eff=%d)",
- uid, (int) getuid(), (int) geteuid());
+ syserr("setreuid(0, %ld) failure (real=%ld, eff=%ld)",
+ (long) uid, (long) getuid(), (long) geteuid());
goto resetuid;
}
# endif /* MAILER_SETUID_METHOD == USE_SETREUID */
@@ -1561,8 +1561,8 @@
#endif /* MAILER_SETUID_METHOD != USE_SETUID */
if (tTd(27, 9))
- sm_dprintf("include: new uid = %d/%d\n",
- (int) getuid(), (int) geteuid());
+ sm_dprintf("include: new uid = %ld/%ld\n",
+ (long) getuid(), (long) geteuid());
/*
** If home directory is remote mounted but server is down,
@@ -1655,8 +1655,8 @@
{
/* don't use this :include: file */
if (tTd(27, 4))
- sm_dprintf("include: not safe (uid=%d): %s\n",
- (int) uid, sm_errstring(rval));
+ sm_dprintf("include: not safe (uid=%ld): %s\n",
+ (long) uid, sm_errstring(rval));
}
else if ((fp = sm_io_open(SmFtStdio, SM_TIME_DEFAULT, fname,
SM_IO_RDONLY, NULL)) == NULL)
@@ -1683,28 +1683,28 @@
{
# if USESETEUID
if (seteuid(0) < 0)
- syserr("!seteuid(0) failure (real=%d, eff=%d)",
- (int) getuid(), (int) geteuid());
+ syserr("!seteuid(0) failure (real=%ld, eff=%ld)",
+ (long) getuid(), (long) geteuid());
# else /* USESETEUID */
if (setreuid(-1, 0) < 0)
- syserr("!setreuid(-1, 0) failure (real=%d, eff=%d)",
- (int) getuid(), (int) geteuid());
+ syserr("!setreuid(-1, 0) failure (real=%ld, eff=%ld)",
+ (long) getuid(), (long) geteuid());
if (setreuid(RealUid, 0) < 0)
- syserr("!setreuid(%d, 0) failure (real=%d, eff=%d)",
- (int) RealUid, (int) getuid(),
- (int) geteuid());
+ syserr("!setreuid(%ld, 0) failure (real=%ld, eff=%ld)",
+ (long) RealUid, (long) getuid(),
+ (long) geteuid());
# endif /* USESETEUID */
}
if (setgid(savedgid) < 0)
- syserr("!setgid(%d) failure (real=%d eff=%d)",
- (int) savedgid, (int) getgid(),
- (int) getegid());
+ syserr("!setgid(%ld) failure (real=%ld eff=%ld)",
+ (long) savedgid, (long) getgid(),
+ (long) getegid());
}
#endif /* HASSETREUID || USESETEUID */
if (tTd(27, 9))
- sm_dprintf("include: reset uid = %d/%d\n",
- (int) getuid(), (int) geteuid());
+ sm_dprintf("include: reset uid = %ld/%ld\n",
+ (long) getuid(), (long) geteuid());
if (rval == E_SM_OPENTIMEOUT)
usrerr("451 4.4.1 open timeout on %s", fname);
Modified: stable/0.8/contrib/sendmail/src/sasl.c
===================================================================
--- stable/0.8/contrib/sendmail/src/sasl.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/sasl.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001-2002 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001-2002 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: sasl.c,v 1.1.1.4 2013-08-14 22:35:48 laffer1 Exp $")
+SM_RCSID("@(#)$Id: sasl.c,v 8.24 2013-11-22 20:51:56 ca Exp $")
#if SASL
# include <stdlib.h>
Modified: stable/0.8/contrib/sendmail/src/savemail.c
===================================================================
--- stable/0.8/contrib/sendmail/src/savemail.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/savemail.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2003, 2006, 2012, 2013 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2003, 2006, 2012, 2013 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: savemail.c,v 1.1.1.6 2013-08-14 22:35:48 laffer1 Exp $")
+SM_RCSID("@(#)$Id: savemail.c,v 8.319 2013-11-22 20:51:56 ca Exp $")
static bool errbody __P((MCI *, ENVELOPE *, char *));
static bool pruneroute __P((char *));
@@ -581,6 +581,10 @@
else
ee->e_flags |= EF_NO_BODY_RETN;
+#if _FFR_BOUNCE_QUEUE
+ if (BounceQueue != NOQGRP)
+ ee->e_qgrp = ee->e_dfqgrp = BounceQueue;
+#endif /* _FFR_BOUNCE_QUEUE */
if (!setnewqueue(ee))
{
syserr("554 5.3.0 returntosender: cannot select queue for %s",
@@ -702,8 +706,15 @@
/* mark statistics */
markstats(ee, NULLADDR, STATS_NORMAL);
- /* actually deliver the error message */
- sendall(ee, SM_DELIVER);
+#if _FFR_BOUNCE_QUEUE
+ if (BounceQueue == NOQGRP)
+ {
+#endif
+ /* actually deliver the error message */
+ sendall(ee, SM_DELIVER);
+#if _FFR_BOUNCE_QUEUE
+ }
+#endif
(void) dropenvelope(ee, true, false);
/* check for delivery errors */
Copied: stable/0.8/contrib/sendmail/src/sendmail.0 (from rev 9097, trunk/contrib/sendmail/src/sendmail.0)
===================================================================
--- stable/0.8/contrib/sendmail/src/sendmail.0 (rev 0)
+++ stable/0.8/contrib/sendmail/src/sendmail.0 2016-10-01 17:46:48 UTC (rev 9102)
@@ -0,0 +1,471 @@
+SENDMAIL(8) SENDMAIL(8)
+
+
+
+NNAAMMEE
+ sendmail - an electronic mail transport agent
+
+SSYYNNOOPPSSIISS
+ sseennddmmaaiill [_f_l_a_g_s] [_a_d_d_r_e_s_s _._._.]
+ nneewwaalliiaasseess
+ mmaaiillqq [--vv]
+ hhoossttssttaatt
+ ppuurrggeessttaatt
+ ssmmttppdd
+
+DDEESSCCRRIIPPTTIIOONN
+ SSeennddmmaaiill sends a message to one or more _r_e_c_i_p_i_e_n_t_s_, routing the message
+ over whatever networks are necessary. SSeennddmmaaiill does internetwork for-
+ warding as necessary to deliver the message to the correct place.
+
+ SSeennddmmaaiill is not intended as a user interface routine; other programs
+ provide user-friendly front ends; sseennddmmaaiill is used only to deliver pre-
+ formatted messages.
+
+ With no flags, sseennddmmaaiill reads its standard input up to an end-of-file
+ or a line consisting only of a single dot and sends a copy of the mes-
+ sage found there to all of the addresses listed. It determines the
+ network(s) to use based on the syntax and contents of the addresses.
+
+ Local addresses are looked up in a file and aliased appropriately.
+ Aliasing can be prevented by preceding the address with a backslash.
+ Beginning with 8.10, the sender is included in any alias expansions,
+ e.g., if `john' sends to `group', and `group' includes `john' in the
+ expansion, then the letter will also be delivered to `john'.
+
+ PPaarraammeetteerrss
+ --AAcc Use submit.cf even if the operation mode does not indicate an
+ initial mail submission.
+
+ --AAmm Use sendmail.cf even if the operation mode indicates an initial
+ mail submission.
+
+ --BB_t_y_p_e Set the body type to _t_y_p_e. Current legal values are 7BIT or
+ 8BITMIME.
+
+ --bbaa Go into ARPANET mode. All input lines must end with a CR-LF,
+ and all messages will be generated with a CR-LF at the end.
+ Also, the ``From:'' and ``Sender:'' fields are examined for the
+ name of the sender.
+
+ --bbCC Check the configuration file.
+
+ --bbdd Run as a daemon. SSeennddmmaaiill will fork and run in background lis-
+ tening on socket 25 for incoming SMTP connections. This is nor-
+ mally run from /etc/rc.
+
+ --bbDD Same as --bbdd except runs in foreground.
+
+ --bbhh Print the persistent host status database.
+
+ --bbHH Purge expired entries from the persistent host status database.
+
+ --bbii Initialize the alias database.
+
+ --bbmm Deliver mail in the usual way (default).
+
+ --bbpp Print a listing of the queue(s).
+
+ --bbPP Print number of entries in the queue(s); only available with
+ shared memory support.
+
+ --bbss Use the SMTP protocol as described in RFC821 on standard input
+ and output. This flag implies all the operations of the --bbaa
+ flag that are compatible with SMTP.
+
+ --bbtt Run in address test mode. This mode reads addresses and shows
+ the steps in parsing; it is used for debugging configuration
+ tables.
+
+ --bbvv Verify names only - do not try to collect or deliver a message.
+ Verify mode is normally used for validating users or mailing
+ lists.
+
+ --CC_f_i_l_e Use alternate configuration file. SSeennddmmaaiill gives up any
+ enhanced (set-user-ID or set-group-ID) privileges if an alter-
+ nate configuration file is specified.
+
+ --DD _l_o_g_f_i_l_e
+ Send debugging output to the indicated log file instead of std-
+ out.
+
+ --dd_c_a_t_e_g_o_r_y.._l_e_v_e_l_._._.
+ Set the debugging flag for _c_a_t_e_g_o_r_y to _l_e_v_e_l. _C_a_t_e_g_o_r_y is
+ either an integer or a name specifying the topic, and _l_e_v_e_l an
+ integer specifying the level of debugging output desired.
+ Higher levels generally mean more output. More than one flag
+ can be specified by separating them with commas. A list of
+ numeric debugging categories can be found in the TRACEFLAGS file
+ in the sendmail source distribution.
+ The option --dd00..11 prints the version of sseennddmmaaiill and the options
+ it was compiled with.
+ Most other categories are only useful with, and documented in,
+ sseennddmmaaiill's source code.
+
+ --FF_f_u_l_l_n_a_m_e
+ Set the full name of the sender.
+
+ --ff_n_a_m_e Sets the name of the ``from'' person (i.e., the envelope sender
+ of the mail). This address may also be used in the From: header
+ if that header is missing during initial submission. The enve-
+ lope sender address is used as the recipient for delivery status
+ notifications and may also appear in a Return-Path: header. --ff
+ should only be used by ``trusted'' users (normally _r_o_o_t, _d_a_e_m_o_n,
+ and _n_e_t_w_o_r_k) or if the person you are trying to become is the
+ same as the person you are. Otherwise, an X-Authentication-
+ Warning header will be added to the message.
+
+ --GG Relay (gateway) submission of a message, e.g., when rrmmaaiill calls
+ sseennddmmaaiill ..
+
+ --hh_N Set the hop count to _N. The hop count is incremented every time
+ the mail is processed. When it reaches a limit, the mail is
+ returned with an error message, the victim of an aliasing loop.
+ If not specified, ``Received:'' lines in the message are
+ counted.
+
+ --ii Do not strip a leading dot from lines in incoming messages, and
+ do not treat a dot on a line by itself as the end of an incoming
+ message. This should be set if you are reading data from a
+ file.
+
+ --LL _t_a_g Set the identifier used in syslog messages to the supplied _t_a_g.
+
+ --NN _d_s_n Set delivery status notification conditions to _d_s_n, which can be
+ `never' for no notifications or a comma separated list of the
+ values `failure' to be notified if delivery failed, `delay' to
+ be notified if delivery is delayed, and `success' to be notified
+ when the message is successfully delivered.
+
+ --nn Don't do aliasing.
+
+ --OO _o_p_t_i_o_n=_v_a_l_u_e
+ Set option _o_p_t_i_o_n to the specified _v_a_l_u_e. This form uses long
+ names. See below for more details.
+
+ --oo_x _v_a_l_u_e
+ Set option _x to the specified _v_a_l_u_e. This form uses single
+ character names only. The short names are not described in this
+ manual page; see the _S_e_n_d_m_a_i_l _I_n_s_t_a_l_l_a_t_i_o_n _a_n_d _O_p_e_r_a_t_i_o_n _G_u_i_d_e
+ for details.
+
+ --pp_p_r_o_t_o_c_o_l
+ Set the name of the protocol used to receive the message. This
+ can be a simple protocol name such as ``UUCP'' or a protocol and
+ hostname, such as ``UUCP:ucbvax''.
+
+ --qq[_t_i_m_e]
+ Process saved messages in the queue at given intervals. If _t_i_m_e
+ is omitted, process the queue once. _T_i_m_e is given as a tagged
+ number, with `s' being seconds, `m' being minutes (default), `h'
+ being hours, `d' being days, and `w' being weeks. For example,
+ `-q1h30m' or `-q90m' would both set the timeout to one hour
+ thirty minutes. By default, sseennddmmaaiill will run in the back-
+ ground. This option can be used safely with --bbdd.
+
+ --qqpp[_t_i_m_e]
+ Similar to --qq_t_i_m_e, except that instead of periodically forking a
+ child to process the queue, sendmail forks a single persistent
+ child for each queue that alternates between processing the
+ queue and sleeping. The sleep time is given as the argument; it
+ defaults to 1 second. The process will always sleep at least 5
+ seconds if the queue was empty in the previous queue run.
+
+ --qqf Process saved messages in the queue once and do not fork(), but
+ run in the foreground.
+
+ --qqG_n_a_m_e
+ Process jobs in queue group called _n_a_m_e only.
+
+ --qq[_!]I_s_u_b_s_t_r
+ Limit processed jobs to those containing _s_u_b_s_t_r as a substring
+ of the queue id or not when _! is specified.
+
+ --qq[_!]Q_s_u_b_s_t_r
+ Limit processed jobs to quarantined jobs containing _s_u_b_s_t_r as a
+ substring of the quarantine reason or not when _! is specified.
+
+ --qq[_!]R_s_u_b_s_t_r
+ Limit processed jobs to those containing _s_u_b_s_t_r as a substring
+ of one of the recipients or not when _! is specified.
+
+ --qq[_!]S_s_u_b_s_t_r
+ Limit processed jobs to those containing _s_u_b_s_t_r as a substring
+ of the sender or not when _! is specified.
+
+ --QQ[reason]
+ Quarantine a normal queue items with the given reason or unquar-
+ antine quarantined queue items if no reason is given. This
+ should only be used with some sort of item matching using as
+ described above.
+
+ --RR _r_e_t_u_r_n
+ Set the amount of the message to be returned if the message
+ bounces. The _r_e_t_u_r_n parameter can be `full' to return the
+ entire message or `hdrs' to return only the headers. In the
+ latter case also local bounces return only the headers.
+
+ --rr_n_a_m_e An alternate and obsolete form of the --ff flag.
+
+ --tt Read message for recipients. To:, Cc:, and Bcc: lines will be
+ scanned for recipient addresses. The Bcc: line will be deleted
+ before transmission.
+
+ --VV _e_n_v_i_d
+ Set the original envelope id. This is propagated across SMTP to
+ servers that support DSNs and is returned in DSN-compliant error
+ messages.
+
+ --vv Go into verbose mode. Alias expansions will be announced, etc.
+
+ --XX _l_o_g_f_i_l_e
+ Log all traffic in and out of mailers in the indicated log file.
+ This should only be used as a last resort for debugging mailer
+ bugs. It will log a lot of data very quickly.
+
+ ---- Stop processing command flags and use the rest of the arguments
+ as addresses.
+
+ OOppttiioonnss
+ There are also a number of processing options that may be set. Nor-
+ mally these will only be used by a system administrator. Options may
+ be set either on the command line using the --oo flag (for short names),
+ the --OO flag (for long names), or in the configuration file. This is a
+ partial list limited to those options that are likely to be useful on
+ the command line and only shows the long names; for a complete list
+ (and details), consult the _S_e_n_d_m_a_i_l _I_n_s_t_a_l_l_a_t_i_o_n _a_n_d _O_p_e_r_a_t_i_o_n _G_u_i_d_e.
+ The options are:
+
+ AliasFile=_f_i_l_e
+ Use alternate alias file.
+
+ HoldExpensive
+ On mailers that are considered ``expensive'' to connect to,
+ don't initiate immediate connection. This requires queueing.
+
+ CheckpointInterval=_N
+ Checkpoint the queue file after every _N successful deliveries
+ (default 10). This avoids excessive duplicate deliveries when
+ sending to long mailing lists interrupted by system crashes.
+
+ DeliveryMode=_x
+ Set the delivery mode to _x. Delivery modes are `i' for interac-
+ tive (synchronous) delivery, `b' for background (asynchronous)
+ delivery, `q' for queue only - i.e., actual delivery is done the
+ next time the queue is run, and `d' for deferred - the same as
+ `q' except that database lookups for maps which have set the -D
+ option (default for the host map) are avoided.
+
+ ErrorMode=_x
+ Set error processing to mode _x. Valid modes are `m' to mail
+ back the error message, `w' to ``write'' back the error message
+ (or mail it back if the sender is not logged in), `p' to print
+ the errors on the terminal (default), `q' to throw away error
+ messages (only exit status is returned), and `e' to do special
+ processing for the BerkNet. If the text of the message is not
+ mailed back by modes `m' or `w' and if the sender is local to
+ this machine, a copy of the message is appended to the file
+ _d_e_a_d_._l_e_t_t_e_r in the sender's home directory.
+
+ SaveFromLine
+ Save UNIX-style From lines at the front of messages.
+
+ MaxHopCount=_N
+ The maximum number of times a message is allowed to ``hop''
+ before we decide it is in a loop.
+
+ IgnoreDots
+ Do not take dots on a line by themselves as a message termina-
+ tor.
+
+ SendMimeErrors
+ Send error messages in MIME format. If not set, the DSN (Deliv-
+ ery Status Notification) SMTP extension is disabled.
+
+ ConnectionCacheTimeout=_t_i_m_e_o_u_t
+ Set connection cache timeout.
+
+ ConnectionCacheSize=_N
+ Set connection cache size.
+
+ LogLevel=_n
+ The log level.
+
+ MeToo=_F_a_l_s_e
+ Don't send to ``me'' (the sender) if I am in an alias expansion.
+
+ CheckAliases
+ Validate the right hand side of aliases during a newaliases(1)
+ command.
+
+ OldStyleHeaders
+ If set, this message may have old style headers. If not set,
+ this message is guaranteed to have new style headers (i.e., com-
+ mas instead of spaces between addresses). If set, an adaptive
+ algorithm is used that will correctly determine the header for-
+ mat in most cases.
+
+ QueueDirectory=_q_u_e_u_e_d_i_r
+ Select the directory in which to queue messages.
+
+ StatusFile=_f_i_l_e
+ Save statistics in the named file.
+
+ Timeout.queuereturn=_t_i_m_e
+ Set the timeout on undelivered messages in the queue to the
+ specified time. After delivery has failed (e.g., because of a
+ host being down) for this amount of time, failed messages will
+ be returned to the sender. The default is five days.
+
+ UserDatabaseSpec=_u_s_e_r_d_a_t_a_b_a_s_e
+ If set, a user database is consulted to get forwarding informa-
+ tion. You can consider this an adjunct to the aliasing mecha-
+ nism, except that the database is intended to be distributed;
+ aliases are local to a particular host. This may not be avail-
+ able if your sendmail does not have the USERDB option compiled
+ in.
+
+ ForkEachJob
+ Fork each job during queue runs. May be convenient on memory-
+ poor machines.
+
+ SevenBitInput
+ Strip incoming messages to seven bits.
+
+ EightBitMode=_m_o_d_e
+ Set the handling of eight bit input to seven bit destinations to
+ _m_o_d_e: m (mimefy) will convert to seven-bit MIME format, p (pass)
+ will pass it as eight bits (but violates protocols), and s
+ (strict) will bounce the message.
+
+ MinQueueAge=_t_i_m_e_o_u_t
+ Sets how long a job must ferment in the queue between attempts
+ to send it.
+
+ DefaultCharSet=_c_h_a_r_s_e_t
+ Sets the default character set used to label 8-bit data that is
+ not otherwise labelled.
+
+ DialDelay=_s_l_e_e_p_t_i_m_e
+ If opening a connection fails, sleep for _s_l_e_e_p_t_i_m_e seconds and
+ try again. Useful on dial-on-demand sites.
+
+ NoRecipientAction=_a_c_t_i_o_n
+ Set the behaviour when there are no recipient headers (To:, Cc:
+ or Bcc:) in the message to _a_c_t_i_o_n: none leaves the message
+ unchanged, add-to adds a To: header with the envelope recipi-
+ ents, add-apparently-to adds an Apparently-To: header with the
+ envelope recipients, add-bcc adds an empty Bcc: header, and add-
+ to-undisclosed adds a header reading `To: undisclosed-recipi-
+ ents:;'.
+
+ MaxDaemonChildren=_N
+ Sets the maximum number of children that an incoming SMTP daemon
+ will allow to spawn at any time to _N.
+
+ ConnectionRateThrottle=_N
+ Sets the maximum number of connections per second to the SMTP
+ port to _N.
+
+ In aliases, the first character of a name may be a vertical bar to
+ cause interpretation of the rest of the name as a command to pipe the
+ mail to. It may be necessary to quote the name to keep sseennddmmaaiill from
+ suppressing the blanks from between arguments. For example, a common
+ alias is:
+
+ msgs: "|/usr/bin/msgs -s"
+
+ Aliases may also have the syntax ``:include:_f_i_l_e_n_a_m_e'' to ask sseennddmmaaiill
+ to read the named file for a list of recipients. For example, an alias
+ such as:
+
+ poets: ":include:/usr/local/lib/poets.list"
+
+ would read _/_u_s_r_/_l_o_c_a_l_/_l_i_b_/_p_o_e_t_s_._l_i_s_t for the list of addresses making
+ up the group.
+
+ SSeennddmmaaiill returns an exit status describing what it did. The codes are
+ defined in <_s_y_s_e_x_i_t_s_._h>:
+
+ EX_OK Successful completion on all addresses.
+
+ EX_NOUSER
+ User name not recognized.
+
+ EX_UNAVAILABLE
+ Catchall meaning necessary resources were not available.
+
+ EX_SYNTAX
+ Syntax error in address.
+
+ EX_SOFTWARE
+ Internal software error, including bad arguments.
+
+ EX_OSERR
+ Temporary operating system error, such as ``cannot fork''.
+
+ EX_NOHOST
+ Host name not recognized.
+
+ EX_TEMPFAIL
+ Message could not be sent immediately, but was queued.
+
+ If invoked as nneewwaalliiaasseess, sseennddmmaaiill will rebuild the alias database. If
+ invoked as mmaaiillqq, sseennddmmaaiill will print the contents of the mail queue.
+ If invoked as hhoossttssttaatt, sseennddmmaaiill will print the persistent host status
+ database. If invoked as ppuurrggeessttaatt, sseennddmmaaiill will purge expired entries
+ from the persistent host status database. If invoked as ssmmttppdd, sseenndd--
+ mmaaiill will act as a daemon, as if the --bbdd option were specified.
+
+NNOOTTEESS
+ sseennddmmaaiill often gets blamed for many problems that are actually the
+ result of other problems, such as overly permissive modes on directo-
+ ries. For this reason, sseennddmmaaiill checks the modes on system directories
+ and files to determine if they can be trusted. Although these checks
+ can be turned off and your system security reduced by setting the DDoonntt--
+ BBllaammeeSSeennddmmaaiill option, the permission problems should be fixed. For
+ more information, see:
+
+ _h_t_t_p_:_/_/_w_w_w_._s_e_n_d_m_a_i_l_._o_r_g_/_t_i_p_s_/_D_o_n_t_B_l_a_m_e_S_e_n_d_m_a_i_l_._h_t_m_l
+
+FFIILLEESS
+ Except for the file _/_e_t_c_/_m_a_i_l_/_s_e_n_d_m_a_i_l_._c_f itself the following path-
+ names are all specified in _/_e_t_c_/_m_a_i_l_/_s_e_n_d_m_a_i_l_._c_f. Thus, these values
+ are only approximations.
+
+
+ /etc/mail/aliases
+ raw data for alias names
+
+ /etc/mail/aliases.db
+ data base of alias names
+
+ /etc/mail/sendmail.cf
+ configuration file
+
+ /etc/mail/helpfile
+ help file
+
+ /etc/mail/statistics
+ collected statistics
+
+ /var/spool/mqueue/*
+ temp files
+
+SSEEEE AALLSSOO
+ binmail(1), mail(1), rmail(1), syslog(3), aliases(5), mailaddr(7),
+ rc(8)
+
+ DARPA Internet Request For Comments _R_F_C_8_1_9, _R_F_C_8_2_1, _R_F_C_8_2_2. _S_e_n_d_m_a_i_l
+ _I_n_s_t_a_l_l_a_t_i_o_n _a_n_d _O_p_e_r_a_t_i_o_n _G_u_i_d_e, No. 8, SMM.
+
+ http://www.sendmail.org/
+
+ US Patent Numbers 6865671, 6986037.
+
+HHIISSTTOORRYY
+ The sseennddmmaaiill command appeared in 4.2BSD.
+
+
+
+ $Date: 2013-11-22 20:51:56 $ SENDMAIL(8)
Modified: stable/0.8/contrib/sendmail/src/sendmail.8
===================================================================
--- stable/0.8/contrib/sendmail/src/sendmail.8 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/sendmail.8 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1998-2003 Sendmail, Inc. and its suppliers.
+.\" Copyright (c) 1998-2003 Proofpoint, Inc. and its suppliers.
.\" All rights reserved.
.\" Copyright (c) 1983, 1997 Eric P. Allman. All rights reserved.
.\" Copyright (c) 1988, 1991, 1993
@@ -9,9 +9,9 @@
.\" the sendmail distribution.
.\"
.\"
-.\" $Id: sendmail.8,v 1.1.1.6 2011-05-17 22:19:51 laffer1 Exp $
+.\" $Id: sendmail.8,v 8.61 2013-11-22 20:51:56 ca Exp $
.\"
-.TH SENDMAIL 8 "$Date: 2011-05-17 22:19:51 $"
+.TH SENDMAIL 8 "$Date: 2013-11-22 20:51:56 $"
.SH NAME
sendmail
\- an electronic mail transport agent
@@ -92,6 +92,9 @@
the ``From:'' and ``Sender:''
fields are examined for the name of the sender.
.TP
+.B \-bC
+Check the configuration file.
+.TP
.B \-bd
Run as a daemon.
.B Sendmail
Modified: stable/0.8/contrib/sendmail/src/sendmail.h
===================================================================
--- stable/0.8/contrib/sendmail/src/sendmail.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/sendmail.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2013 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2013 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -52,7 +52,7 @@
#ifdef _DEFINE
# ifndef lint
-SM_UNUSED(static char SmailId[]) = "@(#)$Id: sendmail.h,v 1.1.1.8 2013-08-14 22:35:48 laffer1 Exp $";
+SM_UNUSED(static char SmailId[]) = "@(#)$Id: sendmail.h,v 8.1104 2013-11-22 20:51:56 ca Exp $";
# endif /* ! lint */
#endif /* _DEFINE */
@@ -122,7 +122,7 @@
# endif /* HESIOD */
#if STARTTLS
-# include <openssl/ssl.h>
+# include <openssl/ssl.h>
# if !TLS_NO_RSA
# if _FFR_FIPSMODE
# define RSA_KEYLENGTH 1024
@@ -137,10 +137,15 @@
# if SASL == 2 || SASL >= 20000
# include <sasl/sasl.h>
+# include <sasl/saslplug.h>
# include <sasl/saslutil.h>
+# if SASL_VERSION_FULL < 0x020119
+typedef int (*sasl_callback_ft)(void);
+# endif /* SASL_VERSION_FULL < 0x020119 */
# else /* SASL == 2 || SASL >= 20000 */
# include <sasl.h>
# include <saslutil.h>
+typedef int (*sasl_callback_ft)(void);
# endif /* SASL == 2 || SASL >= 20000 */
# if defined(SASL_VERSION_MAJOR) && defined(SASL_VERSION_MINOR) && defined(SASL_VERSION_STEP)
# define SASL_VERSION (SASL_VERSION_MAJOR * 10000) + (SASL_VERSION_MINOR * 100) + SASL_VERSION_STEP
@@ -194,11 +199,20 @@
# define INADDR_NONE 0xffffffff
#endif /* ! INADDR_NONE */
+/* By default use uncompressed IPv6 address format (no "::") */
+#ifndef IPV6_FULL
+# define IPV6_FULL 1
+#endif
/* (f)open() modes for queue files */
-# define QF_O_EXTRA 0
+#define QF_O_EXTRA 0
+#if _FFR_PROXY || _FFR_LOGREPLY
+# define _FFR_ERRCODE 1
+#endif
+#define SM_ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
+
/*
** An 'argument class' describes the storage allocation status
** of an object pointed to by an argument to a function.
@@ -278,11 +292,23 @@
#define QBYTRACE 0x00008000 /* DeliverBy: trace */
#define QBYNDELAY 0x00010000 /* DeliverBy: notify, delay */
#define QBYNRELAY 0x00020000 /* DeliverBy: notify, relayed */
+#define QINTBCC 0x00040000 /* internal Bcc */
+#define QDYNMAILER 0x00080000 /* "dynamic mailer" */
#define QTHISPASS 0x40000000 /* temp: address set this pass */
#define QRCPTOK 0x80000000 /* recipient() processed address */
+#define QDYNMAILFLG 'Y'
+
#define Q_PINGFLAGS (QPINGONSUCCESS|QPINGONFAILURE|QPINGONDELAY)
+#if _FFR_RCPTFLAGS
+# define QMATCHFLAGS (QINTBCC|QDYNMAILER)
+# define QMATCH_FLAG(a) ((a)->q_flags & QMATCHFLAGS)
+# define ADDR_FLAGS_MATCH(a, b) (QMATCH_FLAG(a) == QMATCH_FLAG(b))
+#else
+# define ADDR_FLAGS_MATCH(a, b) true
+#endif
+
/* values for q_state */
#define QS_OK 0 /* address ok (for now)/not yet tried */
#define QS_SENT 1 /* good address, delivery complete */
@@ -337,6 +363,9 @@
extern ADDRESS NullAddress; /* a null (template) address [main.c] */
+/* for cataddr() */
+#define NOSPACESEP 256
+
/* functions */
extern void cataddr __P((char **, char **, char *, int, int, bool));
extern char *crackaddr __P((char *, ENVELOPE *));
@@ -417,6 +446,7 @@
};
/* bits for m_flags */
+#define M_xSMTP 0x01 /* internal: {ES,S,L}MTP */
#define M_ESMTP 'a' /* run Extended SMTP */
#define M_ALIASABLE 'A' /* user can be LHS of an alias */
#define M_BLANKEND 'b' /* ensure blank line at end of message */
@@ -444,6 +474,7 @@
#define M_NHDR 'n' /* don't insert From line */
#define M_MANYSTATUS 'N' /* MAIL11V3: DATA returns multi-status */
#define M_RUNASRCPT 'o' /* always run mailer as recipient */
+ /* 'O' free? */
#define M_FROMPATH 'p' /* use reverse-path in MAIL FROM: */
/* 'P' CF: include Return-Path: */
#define M_VRFY250 'q' /* VRFY command returns 250 instead of 252 */
@@ -459,11 +490,14 @@
#define M_NOHOSTSTAT 'W' /* ignore long term host status information */
/* 'x' CF: include Full-Name: */
#define M_XDOT 'X' /* use hidden-dot algorithm */
+ /* 'y' free? */
+ /* 'Y' free? */
#define M_LMTP 'z' /* run Local Mail Transport Protocol */
#define M_DIALDELAY 'Z' /* apply dial delay sleeptime */
#define M_NOMX '0' /* turn off MX lookups */
#define M_NONULLS '1' /* don't send null bytes */
#define M_FSMTP '2' /* force SMTP (no ESMTP even if offered) */
+ /* '4' free? */
#define M_EBCDIC '3' /* extend Q-P encoding for EBCDIC */
#define M_TRYRULESET5 '5' /* use ruleset 5 after local aliasing */
#define M_7BITHDRS '6' /* strip headers to 7 bits even in 8 bit path */
@@ -478,6 +512,7 @@
#define M_HOLD '%' /* Hold delivery until ETRN/-qI/-qR/-qS */
#define M_PLUS '+' /* Reserved: Used in mc for adding new flags */
#define M_MINUS '-' /* Reserved: Used in mc for removing flags */
+#define M_NOMHHACK '!' /* Don't perform HM hack dropping explicit from */
/* functions */
extern void initerrmailers __P((void));
@@ -492,7 +527,11 @@
EXTERN MAILER *InclMailer; /* ptr to *include* mailer */
EXTERN MAILER *LocalMailer; /* ptr to local mailer */
EXTERN MAILER *ProgMailer; /* ptr to program mailer */
+#if _FFR_RCPTFLAGS
+EXTERN MAILER *Mailer[MAXMAILERS * 2 + 1];
+#else
EXTERN MAILER *Mailer[MAXMAILERS + 1];
+#endif
/*
** Queue group definition structure.
@@ -736,6 +775,12 @@
#define MCIF_INLONGLINE 0x01000000 /* in the middle of a long line */
#define MCIF_AUTH2 0x02000000 /* got 2 AUTH lines */
#define MCIF_ONLY_EHLO 0x10000000 /* use only EHLO in smtpinit */
+#if _FFR_HANDLE_HDR_RW_TEMPFAIL
+/* an error is not sticky (if put{header,body}() etc fail) */
+# define MCIF_NOTSTICKY 0x20000000
+#else
+# define MCIF_NOTSTICKY 0
+#endif
#define MCIF_EXTENS (MCIF_EXPN | MCIF_SIZE | MCIF_8BITMIME | MCIF_DSN | MCIF_8BITOK | MCIF_AUTH | MCIF_ENHSTAT | MCIF_TLS | MCIF_AUTH2)
@@ -939,10 +984,16 @@
int e_dlvr_flag; /* deliver by flag */
SM_RPOOL_T *e_rpool; /* resource pool for this envelope */
unsigned int e_features; /* server features */
+#define ENHSC_LEN 11
#if _FFR_MILTER_ENHSC
-#define ENHSC_LEN 11
char e_enhsc[ENHSC_LEN]; /* enhanced status code */
#endif /* _FFR_MILTER_ENHSC */
+#if _FFR_ERRCODE
+ /* smtp error codes during delivery */
+ int e_rcode; /* reply code */
+ char e_renhsc[ENHSC_LEN]; /* enhanced status code */
+ char *e_text; /* reply text */
+#endif /* _FFR_ERRCODE */
};
#define PRT_NONNEGL(v) ((v) < 0 ? LONG_MAX : (v))
@@ -1135,7 +1186,7 @@
#define macid(name) macid_parse(name, NULL)
extern char *macname __P((int));
extern char *macvalue __P((int, ENVELOPE *));
-extern int rscheck __P((char *, char *, char *, ENVELOPE *, int, int, char *, char *, ADDRESS *));
+extern int rscheck __P((char *, char *, char *, ENVELOPE *, int, int, char *, char *, ADDRESS *, char **));
extern int rscap __P((char *, char *, char *, ENVELOPE *, char ***, char *, int));
extern void setclass __P((int, char *));
extern int strtorwset __P((char *, char **, int));
@@ -1299,15 +1350,6 @@
#define MA_UNAVAIL 1 /* member map is not available */
#define MA_TRYAGAIN 2 /* member map returns temp failure */
-/* macros to handle MapTempFail */
-#define BIT_IS_MTP 0x01 /* temp.failure occurred */
-#define BIT_ASK_MTP 0x02 /* do we care about MapTempFail? */
-#define RESET_MAPTEMPFAIL MapTempFail = 0
-#define INIT_MAPTEMPFAIL MapTempFail = BIT_ASK_MTP
-#define SET_MAPTEMPFAIL MapTempFail |= BIT_IS_MTP
-#define IS_MAPTEMPFAIL bitset(BIT_IS_MTP, MapTempFail)
-#define ASK_MAPTEMPFAIL bitset(BIT_ASK_MTP, MapTempFail)
-
/*
** The class of a map -- essentially the functions to call
*/
@@ -1627,6 +1669,10 @@
/* values for e_sendmode -- send modes */
#define SM_DELIVER 'i' /* interactive delivery */
+#if _FFR_PROXY
+#define SM_PROXY_REQ 's' /* synchronous mode requested */
+#define SM_PROXY 'S' /* synchronous mode activated */
+#endif /* _FFR_PROXY */
#define SM_FORK 'b' /* deliver in background */
#if _FFR_DM_ONE
#define SM_DM_ONE 'o' /* deliver first TA in background, then queue */
@@ -1635,7 +1681,11 @@
#define SM_DEFER 'd' /* defer map lookups as well as queue */
#define SM_VERIFY 'v' /* verify only (used internally) */
#define DM_NOTSET (-1) /* DeliveryMode (per daemon) option not set */
+#if _FFR_PROXY
+# define SM_IS_INTERACTIVE(m) ((m) == SM_DELIVER || (m) == SM_PROXY_REQ || (m) == SM_PROXY)
+#else /* _FFR_PROXY */
# define SM_IS_INTERACTIVE(m) ((m) == SM_DELIVER)
+#endif /* _FFR_PROXY */
#define WILL_BE_QUEUED(m) ((m) == SM_QUEUE || (m) == SM_DEFER)
@@ -1730,6 +1780,8 @@
#define RSF_RMCOMM 0x0001 /* strip comments */
#define RSF_UNSTRUCTURED 0x0002 /* unstructured, ignore syntax errors */
#define RSF_COUNT 0x0004 /* count rejections (statistics)? */
+#define RSF_ADDR 0x0008 /* reassemble address */
+#define RSF_STRING 0x0010 /* reassemble address as string */
/*
** Flags passed to mime8to7 and putheader.
@@ -1841,7 +1893,7 @@
#define VENDOR_SUN 2 /* Sun-native configuration file */
#define VENDOR_HP 3 /* Hewlett-Packard specific config syntax */
#define VENDOR_IBM 4 /* IBM specific config syntax */
-#define VENDOR_SENDMAIL 5 /* Sendmail, Inc. specific config syntax */
+#define VENDOR_SENDMAIL 5 /* Proofpoint, Inc. specific config syntax */
#define VENDOR_DEC 6 /* Compaq, DEC, Digital */
/* prototypes for vendor-specific hook routines */
@@ -1887,6 +1939,10 @@
#define D_OPTIONAL 'O' /* optional socket */
#define D_DISABLE ((char)0x02) /* optional socket disabled */
#define D_ISSET ((char)0x03) /* this client struct is set */
+#if _FFR_XCNCT
+#define D_XCNCT ((char)0x04) /* X-Connect was used */
+#define D_XCNCT_M ((char)0x05) /* X-Connect was used + "forged" */
+#endif /* _FFR_XCNCT */
#if STARTTLS
/*
@@ -1920,6 +1976,7 @@
#define TLS_I_KEY_OUNR 0x00400000 /* Key must be other unreadable */
#define TLS_I_CRLF_EX 0x00800000 /* CRL file must exist */
#define TLS_I_CRLF_UNR 0x01000000 /* CRL file must be g/o unreadable */
+#define TLS_I_DHFIXED 0x02000000 /* use fixed DH param */
/* require server cert */
#define TLS_I_SRV_CERT (TLS_I_CERT_EX | TLS_I_KEY_EX | \
@@ -1929,8 +1986,7 @@
/* server requirements */
#define TLS_I_SRV (TLS_I_SRV_CERT | TLS_I_RSA_TMP | TLS_I_VRFY_PATH | \
- TLS_I_VRFY_LOC | TLS_I_TRY_DH | TLS_I_DH1024 | \
- TLS_I_CACHE)
+ TLS_I_VRFY_LOC | TLS_I_TRY_DH | TLS_I_CACHE)
/* client requirements */
#define TLS_I_CLT (TLS_I_KEY_UNR | TLS_I_KEY_OUNR)
@@ -1941,7 +1997,7 @@
/* functions */
extern bool init_tls_library __P((bool _fipsmode));
-extern bool inittls __P((SSL_CTX **, unsigned long, long, bool, char *, char *, char *, char *, char *));
+extern bool inittls __P((SSL_CTX **, unsigned long, unsigned long, bool, char *, char *, char *, char *, char *));
extern bool initclttls __P((bool));
extern void setclttls __P((bool));
extern bool initsrvtls __P((bool));
@@ -1954,10 +2010,9 @@
EXTERN char *CACertFile; /* file with CA certificate */
EXTERN char *CltCertFile; /* file with client certificate */
EXTERN char *CltKeyFile; /* file with client private key */
-# if _FFR_TLS_1
EXTERN char *CipherList; /* list of ciphers */
-EXTERN char *DHParams5; /* file with DH parameters (512) */
-# endif /* _FFR_TLS_1 */
+EXTERN char *CertFingerprintAlgorithm; /* name of fingerprint alg */
+EXTERN const EVP_MD *EVP_digest; /* digest for cert fp */
EXTERN char *DHParams; /* file with DH parameters */
EXTERN char *RandFile; /* source of random data */
EXTERN char *SrvCertFile; /* file with server certificate */
@@ -1967,7 +2022,7 @@
EXTERN char *CRLPath; /* path to CRLs (dir. with hashes) */
#endif /* _FFR_CRLPATH */
EXTERN unsigned long TLS_Srv_Opts; /* TLS server options */
-EXTERN long Srv_SSL_Options, Clt_SSL_Options; /* SSL options */
+EXTERN unsigned long Srv_SSL_Options, Clt_SSL_Options; /* SSL options */
#endif /* STARTTLS */
/*
@@ -2048,9 +2103,7 @@
EXTERN int QueueMode; /* which queue items to act upon */
EXTERN int QueueSortOrder; /* queue sorting order algorithm */
EXTERN time_t MinQueueAge; /* min delivery interval */
-#if _FFR_EXPDELAY
EXTERN time_t MaxQueueAge; /* max delivery interval */
-#endif /* _FFR_EXPDELAY */
EXTERN time_t QueueIntvl; /* intervals between running the queue */
EXTERN char *QueueDir; /* location of queue directory */
EXTERN QUEUE_CHAR *QueueLimitId; /* limit queue run to id */
@@ -2058,6 +2111,9 @@
EXTERN QUEUE_CHAR *QueueLimitRecipient; /* limit queue run to rcpt */
EXTERN QUEUE_CHAR *QueueLimitSender; /* limit queue run to sender */
EXTERN QUEUEGRP *Queue[MAXQUEUEGROUPS + 1]; /* queue groups */
+#if _FFR_BOUNCE_QUEUE
+EXTERN int BounceQueue;
+#endif
/* functions */
extern void assign_queueid __P((ENVELOPE *));
@@ -2259,7 +2315,7 @@
} while (0)
/* reply types (text in SmtpMsgBuffer) */
-#define XS_DEFAULT 0
+#define XS_DEFAULT 0 /* other commands, e.g., RSET */
#define XS_STARTTLS 1
#define XS_AUTH 2
#define XS_GREET 3
@@ -2268,14 +2324,16 @@
#define XS_RCPT 6
#define XS_DATA 7
#define XS_EOM 8
-#define XS_DATA2 9
-#define XS_RCPT2 10
-#define XS_QUIT 15
+#define XS_DATA2 9 /* LMTP */
+#define XS_QUIT 10
/*
** Global variables.
*/
+#if _FFR_ADD_BCC
+EXTERN bool AddBcc;
+#endif
#if _FFR_ADDR_TYPE_MODES
EXTERN bool AddrTypeModes; /* addr_type: extra "mode" information */
#endif /* _FFR_ADDR_TYPE_MODES */
@@ -2331,6 +2389,7 @@
EXTERN bool WorkAroundBrokenAAAA; /* some nameservers return SERVFAIL on AAAA queries */
EXTERN bool UseErrorsTo; /* use Errors-To: header (back compat) */
EXTERN bool UseNameServer; /* using DNS -- interpret h_errno & MX RRs */
+EXTERN bool UseCompressedIPv6Addresses; /* for more specific zero-subnet matches */
EXTERN char InetMode; /* default network for daemon mode */
EXTERN char OpMode; /* operation mode, see below */
EXTERN char SpaceSub; /* substitution for <lwsp> */
@@ -2498,6 +2557,10 @@
extern void flush_errors __P((bool));
extern void PRINTFLIKE(1, 2) message __P((const char *, ...));
extern void PRINTFLIKE(1, 2) nmessage __P((const char *, ...));
+#if _FFR_PROXY
+extern void PRINTFLIKE(3, 4) emessage __P((const char *, const char *, const char *, ...));
+extern int extsc __P((const char *, int, char *, char *));
+#endif /* _FFR_PROXY */
extern void PRINTFLIKE(1, 2) syserr __P((const char *, ...));
extern void PRINTFLIKE(2, 3) usrerrenh __P((char *, const char *, ...));
extern void PRINTFLIKE(1, 2) usrerr __P((const char *, ...));
@@ -2513,7 +2576,7 @@
extern void setalias __P((char *));
/* logging */
-extern void logdelivery __P((MAILER *, MCI *, char *, const char *, ADDRESS *, time_t, ENVELOPE *));
+extern void logdelivery __P((MAILER *, MCI *, char *, const char *, ADDRESS *, time_t, ENVELOPE *, ADDRESS *, int));
extern void logsender __P((ENVELOPE *, char *));
extern void PRINTFLIKE(3, 4) sm_syslog __P((int, const char *, const char *, ...));
@@ -2650,6 +2713,14 @@
extern char *getmodifiers __P((char *, BITMAP256));
extern BITMAP256 *getrequests __P((ENVELOPE *));
extern char *getvendor __P((int));
+#if _FFR_TLS_SE_OPTS && STARTTLS
+# ifndef TLS_VRFY_PER_CTX
+# define TLS_VRFY_PER_CTX 1
+# endif
+extern int get_tls_se_options __P((ENVELOPE *, SSL *, bool));
+#else
+# define get_tls_se_options(e, s, w) 0
+#endif
extern void help __P((char *, ENVELOPE *));
extern void init_md __P((int, char **));
extern void initdaemon __P((void));
@@ -2660,6 +2731,9 @@
extern SIGFUNC_DECL intsig __P((int));
extern bool isatom __P((const char *));
extern bool isloopback __P((SOCKADDR sa));
+#if _FFR_TLS_SE_OPTS && STARTTLS
+extern bool load_certkey __P((SSL *, bool, char *, char *));
+#endif
extern void load_if_names __P((void));
extern bool lockfile __P((int, char *, char *, int));
extern void log_sendmail_pid __P((ENVELOPE *));
@@ -2713,10 +2787,10 @@
extern void sm_setuserenv __P((const char *, const char *));
extern void settime __P((ENVELOPE *));
#if STARTTLS
-extern void set_tls_rd_tmo __P((int));
-#else /* STARTTLS */
-#define set_tls_rd_tmo(rd_tmo)
-#endif /* STARTTLS */
+extern int set_tls_rd_tmo __P((int));
+#else
+# define set_tls_rd_tmo(rd_tmo) 0
+#endif
extern char *sfgets __P((char *, int, SM_FILE_T *, time_t, char *));
extern char *shortenstring __P((const char *, size_t));
extern char *shorten_hostname __P((char []));
@@ -2768,10 +2842,13 @@
extern bool writable __P((char *, ADDRESS *, long));
#if SM_HEAP_CHECK
# define xalloc(size) xalloc_tagged(size, __FILE__, __LINE__)
-extern char *xalloc_tagged __P((int, char*, int));
+extern char *xalloc_tagged __P((int, char *, int));
#else /* SM_HEAP_CHECK */
extern char *xalloc __P((int));
#endif /* SM_HEAP_CHECK */
+#if _FFR_XCNCT
+extern int xconnect __P((SM_FILE_T *));
+#endif /* _FFR_XCNCT */
extern void xputs __P((SM_FILE_T *, const char *));
extern char *xtextify __P((char *, char *));
extern bool xtextok __P((char *));
@@ -2778,6 +2855,9 @@
extern int xunlink __P((char *));
extern char *xuntextify __P((char *));
+#if _FFR_RCPTFLAGS
+extern bool newmodmailer __P((ADDRESS *, int));
+#endif
#undef EXTERN
#endif /* ! _SENDMAIL_H */
Modified: stable/0.8/contrib/sendmail/src/sfsasl.c
===================================================================
--- stable/0.8/contrib/sendmail/src/sfsasl.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/sfsasl.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2006, 2008 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2006, 2008 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,10 +9,11 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: sfsasl.c,v 1.1.1.6 2013-08-14 22:35:48 laffer1 Exp $")
+SM_RCSID("@(#)$Id: sfsasl.c,v 8.121 2013-11-22 20:51:56 ca Exp $")
#include <stdlib.h>
#include <sendmail.h>
#include <sm/time.h>
+#include <sm/fdset.h>
#include <errno.h>
/* allow to disable error handling code just in case... */
@@ -415,7 +416,7 @@
#if STARTTLS
# include "sfsasl.h"
-# include <openssl/err.h>
+# include <openssl/err.h>
/* Structure used by the "tls" file type */
struct tls_obj
@@ -618,9 +619,8 @@
where, rfd, wfd, err);
}
- if (FD_SETSIZE > 0 &&
- ((err == SSL_ERROR_WANT_READ && rfd >= FD_SETSIZE) ||
- (err == SSL_ERROR_WANT_WRITE && wfd >= FD_SETSIZE)))
+ if ((err == SSL_ERROR_WANT_READ && !SM_FD_OK_SELECT(rfd)) ||
+ (err == SSL_ERROR_WANT_WRITE && !SM_FD_OK_SELECT(wfd)))
{
if (LogLevel > 5)
{
@@ -627,8 +627,8 @@
sm_syslog(LOG_ERR, NOQID,
"STARTTLS=%s, error: fd %d/%d too large",
where, rfd, wfd);
- if (LogLevel > 8)
- tlslogerr(LOG_WARNING, where);
+ if (LogLevel > 8)
+ tlslogerr(LOG_WARNING, where);
}
errno = EINVAL;
}
@@ -685,17 +685,21 @@
** rd_tmo -- read timeout
**
** Results:
-** none
+** previous read timeout
** This is a hack: there is no way to pass it in
*/
static int tls_rd_tmo = -1;
-void
+int
set_tls_rd_tmo(rd_tmo)
int rd_tmo;
{
+ int old_rd_tmo;
+
+ old_rd_tmo = tls_rd_tmo;
tls_rd_tmo = rd_tmo;
+ return old_rd_tmo;
}
/*
@@ -820,7 +824,7 @@
}
else if (LogLevel > 7)
sm_syslog(LOG_WARNING, NOQID,
- "STARTTLS: read error=%s (%d), retry=%d, ssl_err=%d",
+ "STARTTLS: read error=%s (%d), errno=%d, retry=%d, ssl_err=%d",
err, r, errno, try, ssl_err);
errno = save_errno;
}
Modified: stable/0.8/contrib/sendmail/src/sfsasl.h
===================================================================
--- stable/0.8/contrib/sendmail/src/sfsasl.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/sfsasl.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2000, 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999, 2000, 2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: sfsasl.h,v 1.1.1.3 2006-08-04 02:03:05 laffer1 Exp $"
+ * $Id: sfsasl.h,v 8.21 2013-11-22 20:51:56 ca Exp $"
*/
#ifndef SFSASL_H
Modified: stable/0.8/contrib/sendmail/src/shmticklib.c
===================================================================
--- stable/0.8/contrib/sendmail/src/shmticklib.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/shmticklib.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2000 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2000 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -11,7 +11,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: shmticklib.c,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $")
+SM_RCSID("@(#)$Id: shmticklib.c,v 8.15 2013-11-22 20:51:56 ca Exp $")
#if _FFR_SHM_STATUS
# include <sys/types.h>
Modified: stable/0.8/contrib/sendmail/src/sm_resolve.c
===================================================================
--- stable/0.8/contrib/sendmail/src/sm_resolve.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/sm_resolve.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2004, 2010 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2004, 2010 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -50,7 +50,7 @@
# endif /* NETINET */
# include "sm_resolve.h"
-SM_RCSID("$Id: sm_resolve.c,v 1.1.1.5 2011-05-17 22:19:51 laffer1 Exp $")
+SM_RCSID("$Id: sm_resolve.c,v 8.40 2013-11-22 20:51:56 ca Exp $")
static struct stot
{
@@ -235,7 +235,7 @@
if (LogLevel > 5)
sm_syslog(LOG_WARNING, NOQID,
"ERROR: DNS RDLENGTH=%d > data len=%d",
- size, len - (p - data));
+ size, len - (int)(p - data));
dns_free_data(r);
return NULL;
}
Modified: stable/0.8/contrib/sendmail/src/sm_resolve.h
===================================================================
--- stable/0.8/contrib/sendmail/src/sm_resolve.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/sm_resolve.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -41,7 +41,7 @@
* SUCH DAMAGE.
*/
-/* $Id: sm_resolve.h,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $ */
+/* $Id: sm_resolve.h,v 8.9 2013-11-22 20:51:56 ca Exp $ */
#if DNSMAP
# ifndef __ROKEN_RESOLVE_H__
Modified: stable/0.8/contrib/sendmail/src/srvrsmtp.c
===================================================================
--- stable/0.8/contrib/sendmail/src/srvrsmtp.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/srvrsmtp.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2010, 2012, 2013 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2010, 2012-2014 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -17,7 +17,7 @@
# include <libmilter/mfdef.h>
#endif /* MILTER */
-SM_RCSID("@(#)$Id: srvrsmtp.c,v 1.1.1.9 2013-08-14 22:35:48 laffer1 Exp $")
+SM_RCSID("@(#)$Id: srvrsmtp.c,v 8.1016 2013-11-22 20:51:56 ca Exp $")
#include <sm/time.h>
#include <sm/fdset.h>
@@ -30,7 +30,7 @@
static int saslmechs __P((sasl_conn_t *, char **));
#endif /* SASL */
#if STARTTLS
-# include <openssl/err.h>
+# include <openssl/err.h>
# include <sysexits.h>
static SSL_CTX *srv_ctx = NULL; /* TLS server context */
@@ -204,7 +204,175 @@
args[argno] = NULL;
}
+#if _FFR_ADD_BCC
+
/*
+** ADDRCPT -- Add a rcpt to sendq list
+**
+** Parameters:
+** rcpt -- rcpt
+** sendq -- a pointer to the head of a queue to put
+** these people into.
+** e -- the envelope in which to add these recipients.
+**
+** Returns:
+** The number of addresses added to the list.
+*/
+
+static int
+addrcpt(rcpt, sendq, e)
+ char *rcpt;
+ ADDRESS **sendq;
+ ENVELOPE *e;
+{
+ int r;
+ char *oldto;
+ ADDRESS *a;
+
+ SM_REQUIRE(rcpt != NULL);
+ SM_REQUIRE(sendq != NULL);
+ SM_REQUIRE(e != NULL);
+ oldto = e->e_to;
+ if (tTd(25, 1))
+ sm_dprintf("addrcpt: rcpt=%s\n", rcpt);
+ r = Errors;
+ a = NULL;
+ SM_TRY
+ {
+ macdefine(&e->e_macro, A_PERM, macid("{addr_type}"), "e b");
+ a = parseaddr(rcpt, NULLADDR, RF_COPYALL, ' ', NULL, e, true);
+ if (a == NULL)
+ return 0;
+
+ a->q_flags &= ~Q_PINGFLAGS;
+ a->q_flags |= QINTBCC;
+ a->q_owner = "<>";
+
+ /* disable alias expansion? */
+ a = recipient(a, sendq, 0, e);
+ }
+ SM_FINALLY
+ {
+ e->e_to = oldto;
+ macdefine(&e->e_macro, A_PERM, macid("{addr_type}"), NULL);
+ }
+ SM_END_TRY
+ if (tTd(25, 1))
+ sm_dprintf("addrcpt: rcpt=%s, flags=%#lx\n", rcpt,
+ a != NULL ? a->q_flags : 0);
+ Errors = r;
+ return 1;
+}
+
+/*
+** ADDBCC -- Maybe create a copy of an e-mail
+**
+** Parameters:
+** a -- current RCPT
+** e -- the envelope.
+**
+** Returns:
+** nothing
+**
+** Side Effects:
+** rscheck() can trigger an "exception"
+*/
+
+static void
+addbcc(a, e)
+ ADDRESS *a;
+ ENVELOPE *e;
+{
+ int nobcc;
+ char *newrcpt, empty[1];
+
+ if (!AddBcc)
+ return;
+
+ nobcc = false;
+ empty[0] = '\0';
+ newrcpt = empty;
+
+ nobcc = rscheck("bcc", a->q_paddr, NULL, e, RSF_ADDR, 12, NULL, NOQID,
+ NULL, &newrcpt);
+ if (tTd(25, 1))
+ sm_dprintf("addbcc: nobcc=%d, Errors=%d, newrcpt=<%s>\n", nobcc, Errors, newrcpt);
+ if (nobcc != EX_OK || Errors > 0 || *newrcpt == '\0')
+ return;
+
+ (void) addrcpt(newrcpt, &e->e_sendqueue, e);
+ return;
+}
+#else /* _FFR_ADD_BCC */
+# define addbcc(a, e)
+#endif /* _FFR_ADD_BCC */
+
+#if _FFR_RCPTFLAGS
+/*
+** RCPTMODS -- Perform rcpt modifications if requested
+**
+** Parameters:
+** rcpt -- current RCPT
+** e -- the envelope.
+**
+** Returns:
+** nothing.
+*/
+
+void
+rcptmods(rcpt, e)
+ ADDRESS *rcpt;
+ ENVELOPE *e;
+{
+ char *fl;
+
+ SM_REQUIRE(rcpt != NULL);
+ SM_REQUIRE(e != NULL);
+
+ fl = macvalue(macid("{rcpt_flags}"), e);
+ if (fl == NULL || *fl == '\0')
+ return;
+ if (tTd(25, 1))
+ sm_dprintf("rcptmods: rcpt=%s, flags=%s\n", rcpt->q_paddr, fl);
+
+ /* parse flags */
+ for ( ; *fl != '\0'; ++fl)
+ {
+ switch (*fl)
+ {
+ case 'n':
+ rcpt->q_flags &= ~Q_PINGFLAGS;
+ rcpt->q_flags |= QINTBCC;
+ rcpt->q_owner = "<>";
+ break;
+
+ case 'N':
+ rcpt->q_flags &= ~Q_PINGFLAGS;
+ rcpt->q_owner = "<>";
+ break;
+
+ case QDYNMAILFLG:
+ rcpt->q_flags |= QDYNMAILER;
+ newmodmailer(rcpt, *fl);
+ break;
+
+ default:
+ sm_syslog(LOG_INFO, e->e_id,
+ "rcpt=%s, rcpt_flags=%s, status=unknown",
+ rcpt->q_paddr, fl);
+ break;
+ }
+ }
+
+ /* reset macro to avoid confusion later on */
+ macdefine(&e->e_macro, A_PERM, macid("{rcpt_flags}"), NULL);
+
+}
+#else /* _FFR_RCPTFLAGS */
+# define rcptmods(a, e)
+#endif /* _FFR_RCPTFLAGS */
+
+/*
** SMTP -- run the SMTP protocol.
**
** Parameters:
@@ -541,6 +709,24 @@
qid_printname(e), CurSmtpClient, inp); \
}
+/*
+** Determine the correct protocol keyword to use in the
+** Received: header, following RFC 3848.
+*/
+
+#if !STARTTLS
+# define tls_active false
+#endif
+#if SASL
+# define auth_active (authenticating == SASL_IS_AUTH)
+#else
+# define auth_active false
+#endif
+#define GET_PROTOCOL() \
+ (auth_active \
+ ? (tls_active ? "ESMTPSA" : "ESMTPA") \
+ : (tls_active ? "ESMTPS" : "ESMTP"))
+
static bool SevenBitInput_Saved; /* saved version of SevenBitInput */
void
@@ -577,6 +763,7 @@
SMTP_T smtp;
char *addr;
char *greetcode = "220";
+ const char *greetmsg = "not accepting messages";
char *hostname; /* my hostname ($j) */
QUEUE_CHAR *new;
char *args[MAXSMTPARGS];
@@ -907,12 +1094,8 @@
}
#endif /* SASL */
-#if STARTTLS
+ (void) set_tls_rd_tmo(TimeOuts.to_nextcommand);
-
- set_tls_rd_tmo(TimeOuts.to_nextcommand);
-#endif /* STARTTLS */
-
#if MILTER
if (smtp.sm_milterize)
{
@@ -968,7 +1151,73 @@
response = milter_connect(q, RealHostAddr, e, &state);
switch (state)
{
+#if _FFR_MILTER_CONNECT_REPLYCODE
+ case SMFIR_REPLYCODE:
+ if (*response == '5')
+ {
+ if (MilterLogLevel > 3)
+ sm_syslog(LOG_INFO, e->e_id,
+ "Milter: connect: host=%s, addr=%s, reject=%s",
+ peerhostname,
+ anynet_ntoa(&RealHostAddr),
+ response);
+ greetcode = "554"; /* Required by 2821 3.1 */
+ nullserver = newstr(response);
+ if (strlen(nullserver) > 4)
+ {
+ int skip;
+
+ greetmsg = nullserver + 4;
+
+ /* skip over enhanced status code */
+ skip = isenhsc(greetmsg, ' ');
+ if (skip > 0)
+ greetmsg += skip + 1;
+ }
+ smtp.sm_milterize = false;
+ break;
+ }
+ else if (strncmp(response, "421 ", 4) == 0)
+ {
+ int skip;
+ const char *msg = response + 4;
+
+ if (MilterLogLevel > 3)
+ sm_syslog(LOG_INFO, e->e_id,
+ "Milter: connect: host=%s, addr=%s, shutdown=%s",
+ peerhostname,
+ anynet_ntoa(&RealHostAddr),
+ response);
+ tempfail = true;
+ smtp.sm_milterize = false;
+
+ /* skip over enhanced status code */
+ skip = isenhsc(msg, ' ');
+ if (skip > 0)
+ msg += skip + 1;
+ message("421 %s %s", MyHostName, msg);
+
+ /* arrange to ignore send list */
+ e->e_sendqueue = NULL;
+ goto doquit;
+ }
+ else
+ {
+ if (MilterLogLevel > 3)
+ sm_syslog(LOG_INFO, e->e_id,
+ "Milter: connect: host=%s, addr=%s, temp failing commands=%s",
+ peerhostname,
+ anynet_ntoa(&RealHostAddr),
+ response);
+ /*tempfail = true;*/
+ smtp.sm_milterize = false;
+ nullserver = newstr(response);
+ break;
+ }
+
+#else /* _FFR_MILTER_CONNECT_REPLYCODE */
case SMFIR_REPLYCODE: /* REPLYCODE shouldn't happen */
+#endif /* _FFR_MILTER_CONNECT_REPLYCODE */
case SMFIR_REJECT:
if (MilterLogLevel > 3)
sm_syslog(LOG_INFO, e->e_id,
@@ -1006,7 +1255,7 @@
goto doquit;
}
if (response != NULL)
- sm_free(response); /* XXX */
+ sm_free(response);
}
#endif /* MILTER */
@@ -1097,8 +1346,8 @@
/* output the first line, inserting "ESMTP" as second word */
if (*greetcode == '5')
- (void) sm_snprintf(inp, sizeof(inp),
- "%s not accepting messages", hostname);
+ (void) sm_snprintf(inp, sizeof(inp), "%s %s", hostname,
+ greetmsg);
else
expand(SmtpGreeting, inp, sizeof(inp), e);
@@ -1400,6 +1649,8 @@
*ssf);
}
+ protocol = GET_PROTOCOL();
+
/*
** Only switch to encrypted connection
** if a security layer has been negotiated
@@ -1868,6 +2119,14 @@
goto tls_done;
}
+ if (get_tls_se_options(e, srv_ssl, true) != 0)
+ {
+ message("454 4.3.3 TLS not available: error setting options");
+ SSL_free(srv_ssl);
+ srv_ssl = NULL;
+ goto tls_done;
+ }
+
# if !TLS_VRFY_PER_CTX
/*
** this could be used if it were possible to set
@@ -1898,13 +2157,12 @@
SSL_set_accept_state(srv_ssl);
-# define SSL_ACC(s) SSL_accept(s)
-
tlsstart = curtime();
ssl_retry:
- if ((r = SSL_ACC(srv_ssl)) <= 0)
+ if ((r = SSL_accept(srv_ssl)) <= 0)
{
int i, ssl_err;
+ int save_errno = errno;
ssl_err = SSL_get_error(srv_ssl, r);
i = tls_retry(srv_ssl, rfd, wfd, tlsstart,
@@ -1924,7 +2182,7 @@
"STARTTLS=server, error: accept failed=%d, reason=%s, SSL_error=%d, errno=%d, retry=%d, relay=%.100s",
r, sr == NULL ? "unknown"
: sr,
- ssl_err, errno, i,
+ ssl_err, save_errno, i,
CurSmtpClient);
if (LogLevel > 9)
tlslogerr(LOG_WARNING, "server");
@@ -1962,7 +2220,7 @@
macvalue(macid("{verify}"), e),
"STARTTLS", e,
RSF_RMCOMM|RSF_COUNT,
- 5, NULL, NOQID, NULL) != EX_OK ||
+ 5, NULL, NOQID, NULL, NULL) != EX_OK ||
Errors > 0)
{
extern char MsgBuf[];
@@ -2052,7 +2310,7 @@
DELAY_CONN("EHLO");
if (c->cmd_code == CMDEHLO)
{
- protocol = "ESMTP";
+ protocol = GET_PROTOCOL();
SmtpPhase = "server EHLO";
}
else
@@ -2468,7 +2726,7 @@
#endif /* _FFR_MAIL_MACRO */
if (rscheck("check_mail", addr,
NULL, e, RSF_RMCOMM|RSF_COUNT, 3,
- NULL, e->e_id, NULL) != EX_OK ||
+ NULL, e->e_id, NULL, NULL) != EX_OK ||
Errors > 0)
sm_exc_raisenew_x(&EtypeQuickAbort, 1);
macdefine(&e->e_macro, A_PERM,
@@ -2731,7 +2989,7 @@
macid("{addr_type}"), "e r");
if (rscheck("check_rcpt", addr,
NULL, e, RSF_RMCOMM|RSF_COUNT, 3,
- NULL, e->e_id, p_addr_st) != EX_OK ||
+ NULL, e->e_id, p_addr_st, NULL) != EX_OK ||
Errors > 0)
goto rcpt_done;
macdefine(&e->e_macro, A_PERM,
@@ -2744,6 +3002,9 @@
milter_cmd_safe = true;
#endif
+ addbcc(a, e);
+ rcptmods(a, e);
+
/* save in recipient list after ESMTP mods */
a = recipient(a, &e->e_sendqueue, 0, e);
/* may trigger exception... */
@@ -2821,6 +3082,7 @@
#if !MILTER
rcpt_done:
#endif /* !MILTER */
+
macdefine(&e->e_macro, A_PERM,
macid("{rcpt_mailer}"), NULL);
macdefine(&e->e_macro, A_PERM,
@@ -2974,8 +3236,8 @@
{
/* do config file checking of the address */
if (rscheck(vrfy ? "check_vrfy" : "check_expn",
- p, NULL, e, RSF_RMCOMM,
- 3, NULL, NOQID, NULL) != EX_OK ||
+ p, NULL, e, RSF_RMCOMM, 3, NULL,
+ NOQID, NULL, NULL) != EX_OK ||
Errors > 0)
sm_exc_raisenew_x(&EtypeQuickAbort, 1);
(void) sendtolist(p, NULLADDR, &vrfyqueue, 0, e);
@@ -3070,9 +3332,8 @@
** available to make a decision.
*/
- if (rscheck("check_etrn", p, NULL, e,
- RSF_RMCOMM, 3, NULL, NOQID, NULL)
- != EX_OK ||
+ if (rscheck("check_etrn", p, NULL, e, RSF_RMCOMM, 3,
+ NULL, NOQID, NULL, NULL) != EX_OK ||
Errors > 0)
break;
@@ -3371,7 +3632,7 @@
(void) sm_snprintf(buf, sizeof(buf), "%u", smtp->sm_nrcpts);
if (rscheck("check_data", buf, NULL, e,
RSF_RMCOMM|RSF_UNSTRUCTURED|RSF_COUNT, 3, NULL,
- e->e_id, NULL) != EX_OK)
+ e->e_id, NULL, NULL) != EX_OK)
return true;
#if MILTER && SMFI_VERSION > 3
@@ -3494,7 +3755,7 @@
/* rscheck() will set Errors or EF_DISCARD if it trips */
(void) rscheck("check_eom", buf, NULL, e, RSF_UNSTRUCTURED|RSF_COUNT,
- 3, NULL, e->e_id, NULL);
+ 3, NULL, e->e_id, NULL, NULL);
#if MILTER
milteraccept = true;
@@ -3735,7 +3996,39 @@
_res.retrans = TimeOuts.res_retrans[RES_TO_FIRST];
#endif /* NAMED_BIND */
+#if _FFR_PROXY
+ if (SM_PROXY_REQ == e->e_sendmode)
+ {
+ /* is proxy mode possible? */
+ if (e->e_sibling == NULL && e->e_nrcpts == 1
+ && smtp->sm_nrcpts == 1
+ && (a = e->e_sendqueue) != NULL && a->q_next == NULL)
+ {
+ a->q_flags &= ~(QPINGONFAILURE|QPINGONSUCCESS|
+ QPINGONDELAY);
+ e->e_errormode = EM_QUIET;
+ e->e_sendmode = SM_PROXY;
+ }
+ else
+ {
+ if (tTd(87, 2))
+ {
+ a = e->e_sendqueue;
+ sm_dprintf("srv: mode=%c, e=%p, sibling=%p, nrcpts=%d, sm_nrcpts=%d, sendqueue=%p, next=%p\n",
+ e->e_sendmode, e, e->e_sibling, e->e_nrcpts,
+ smtp->sm_nrcpts, a,
+ (a == NULL) ? (void *)0 : a->q_next);
+ }
+ /* switch to interactive mode */
+ e->e_sendmode = SM_DELIVER;
+ if (LogLevel > 9)
+ sm_syslog(LOG_DEBUG, e->e_id,
+ "proxy mode requested but not possible");
+ }
+ }
+#endif /* _FFR_PROXY */
+
for (ee = e; ee != NULL; ee = ee->e_sibling)
{
/* make sure we actually do delivery */
@@ -3779,6 +4072,84 @@
oldid = CurEnv->e_id;
CurEnv->e_id = id;
+#if _FFR_PROXY
+ a = e->e_sendqueue;
+ if (tTd(87, 1))
+ {
+ sm_dprintf("srv: mode=%c, e=%p, sibling=%p, nrcpts=%d, msg=%s, sendqueue=%p, next=%p, state=%d, SmtpError=%s, rcode=%d, renhsc=%s, text=%s\n",
+ e->e_sendmode, e, e->e_sibling, e->e_nrcpts, e->e_message, a,
+ (a == NULL) ? (void *)0 : a->q_next,
+ (a == NULL) ? -1 : a->q_state, SmtpError, e->e_rcode,
+ e->e_renhsc, e->e_text);
+ }
+
+ if (SM_PROXY == e->e_sendmode && a->q_state != QS_SENT &&
+ a->q_state != QS_VERIFIED) /* discarded! */
+ {
+ char *m, *errtext;
+ char replycode[4];
+ char enhsc[10];
+ int offset;
+
+#define NN_MSG(e) (((e)->e_message != NULL) ? (e)->e_message : "")
+ m = e->e_message;
+#define SM_MSG_DEFERRED "Deferred: "
+ if (m != NULL && strncmp(SM_MSG_DEFERRED, m,
+ sizeof(SM_MSG_DEFERRED) - 1) == 0)
+ m += sizeof(SM_MSG_DEFERRED) - 1;
+ offset = extsc(m, ' ', replycode, enhsc);
+
+ if (tTd(87, 2))
+ {
+ sm_dprintf("srv: SmtpError=%s, rcode=%d, renhsc=%s, replycode=%s, enhsc=%s, offset=%d\n",
+ SmtpError, e->e_rcode, e->e_renhsc,
+ replycode, enhsc, offset);
+ }
+
+#define DIG2CHAR(d) ((d) + '0')
+ if (e->e_rcode != 0 && (replycode[0] == '\0' ||
+ replycode[0] == DIG2CHAR(REPLYTYPE(e->e_rcode))))
+ {
+ replycode[0] = DIG2CHAR(REPLYTYPE(e->e_rcode));
+ replycode[1] = DIG2CHAR(REPLYCLASS(e->e_rcode));
+ replycode[2] = DIG2CHAR(REPLYMINOR(e->e_rcode));
+ replycode[3] = '\0';
+ if (e->e_renhsc[0] == replycode[0])
+ sm_strlcpy(enhsc, e->e_renhsc, sizeof(enhsc));
+ if (offset < 0)
+ offset = 0;
+ }
+ if (e->e_text != NULL)
+ {
+ (void) strreplnonprt(e->e_text, '_');
+ errtext = e->e_text;
+ }
+ else
+ errtext = m + offset;
+
+ if (replycode[0] != '\0' && enhsc[0] != '\0')
+ emessage(replycode, enhsc, "%s", errtext);
+ else if (replycode[0] != '\0')
+ emessage(replycode, smtptodsn(atoi(replycode)),
+ "%s", errtext);
+ else if (QS_IS_TEMPFAIL(a->q_state))
+ {
+ if (m != NULL)
+ message("450 4.5.1 %s", m);
+ else
+ message("450 4.5.1 Temporary error");
+ }
+ else
+ {
+ if (m != NULL)
+ message("550 5.5.1 %s", m);
+ else
+ message("550 5.0.0 Permanent error");
+ }
+ }
+ else
+ {
+#endif /* _FFR_PROXY */
/* issue success message */
#if _FFR_MSG_ACCEPT
if (MessageAccept != NULL && *MessageAccept != '\0')
@@ -3791,6 +4162,9 @@
else
#endif /* _FFR_MSG_ACCEPT */
message("250 2.0.0 %s Message accepted for delivery", id);
+#if _FFR_PROXY
+ }
+#endif /* _FFR_PROXY */
CurEnv->e_id = oldid;
/* if we just queued, poke it */
@@ -3937,7 +4311,7 @@
? e->e_enhsc :
#endif /* _FFR_MILTER_ENHSC */
a->q_status,
- msg, NULL, (time_t) 0, e);
+ msg, NULL, (time_t) 0, e, a, EX_OK /* ??? */);
}
e->e_to = NULL;
}
@@ -4339,8 +4713,8 @@
SuprErrs = true;
QuickAbort = false;
if (strcmp(auth_param, "<>") != 0 &&
- (rscheck("trust_auth", auth_param, NULL, e, RSF_RMCOMM,
- 9, NULL, NOQID, NULL) != EX_OK || Errors > 0))
+ (rscheck("trust_auth", auth_param, NULL, e, RSF_RMCOMM, 9,
+ NULL, NOQID, NULL, NULL) != EX_OK || Errors > 0))
{
if (tTd(95, 8))
{
Modified: stable/0.8/contrib/sendmail/src/stab.c
===================================================================
--- stable/0.8/contrib/sendmail/src/stab.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/stab.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2001, 2003 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2001, 2003 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: stab.c,v 1.1.1.4 2013-08-14 22:35:48 laffer1 Exp $")
+SM_RCSID("@(#)$Id: stab.c,v 8.92 2013-11-22 20:51:56 ca Exp $")
/*
** STAB -- manage the symbol table
Modified: stable/0.8/contrib/sendmail/src/stats.c
===================================================================
--- stable/0.8/contrib/sendmail/src/stats.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/stats.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2002 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: stats.c,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $")
+SM_RCSID("@(#)$Id: stats.c,v 8.58 2013-11-22 20:51:56 ca Exp $")
#include <sendmail/mailstats.h>
Modified: stable/0.8/contrib/sendmail/src/statusd_shm.h
===================================================================
--- stable/0.8/contrib/sendmail/src/statusd_shm.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/statusd_shm.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2000 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2000 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: statusd_shm.h,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $
+ * $Id: statusd_shm.h,v 8.8 2013-11-22 20:51:57 ca Exp $
*
* Contributed by Exactis.com, Inc.
*
Modified: stable/0.8/contrib/sendmail/src/sysexits.c
===================================================================
--- stable/0.8/contrib/sendmail/src/sysexits.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/sysexits.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: sysexits.c,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $")
+SM_RCSID("@(#)$Id: sysexits.c,v 8.35 2013-11-22 20:51:57 ca Exp $")
/*
** DSNTOEXITSTAT -- convert DSN-style error code to EX_ style.
Copied: stable/0.8/contrib/sendmail/src/sysexits.h (from rev 9097, trunk/contrib/sendmail/src/sysexits.h)
===================================================================
--- stable/0.8/contrib/sendmail/src/sysexits.h (rev 0)
+++ stable/0.8/contrib/sendmail/src/sysexits.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 1987, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the sendmail distribution.
+ *
+ * $Id: sysexits.h,v 8.5 2000-11-26 02:13:20 ca Exp $
+ * @(#)sysexits.h 8.1 (Berkeley) 6/2/93
+ */
+
+#ifndef _SYSEXITS_H_
+# define _SYSEXITS_H_
+
+/*
+** SYSEXITS.H -- Exit status codes for system programs.
+**
+** This include file attempts to categorize possible error
+** exit statuses for system programs, notably delivermail
+** and the Berkeley network.
+**
+** Error numbers begin at EX__BASE to reduce the possibility of
+** clashing with other exit statuses that random programs may
+** already return. The meaning of the codes is approximately
+** as follows:
+**
+** EX_USAGE -- The command was used incorrectly, e.g., with
+** the wrong number of arguments, a bad flag, a bad
+** syntax in a parameter, or whatever.
+** EX_DATAERR -- The input data was incorrect in some way.
+** This should only be used for user's data & not
+** system files.
+** EX_NOINPUT -- An input file (not a system file) did not
+** exist or was not readable. This could also include
+** errors like "No message" to a mailer (if it cared
+** to catch it).
+** EX_NOUSER -- The user specified did not exist. This might
+** be used for mail addresses or remote logins.
+** EX_NOHOST -- The host specified did not exist. This is used
+** in mail addresses or network requests.
+** EX_UNAVAILABLE -- A service is unavailable. This can occur
+** if a support program or file does not exist. This
+** can also be used as a catchall message when something
+** you wanted to do doesn't work, but you don't know
+** why.
+** EX_SOFTWARE -- An internal software error has been detected.
+** This should be limited to non-operating system related
+** errors as possible.
+** EX_OSERR -- An operating system error has been detected.
+** This is intended to be used for such things as "cannot
+** fork", "cannot create pipe", or the like. It includes
+** things like getuid returning a user that does not
+** exist in the passwd file.
+** EX_OSFILE -- Some system file (e.g., /etc/passwd, /etc/utmp,
+** etc.) does not exist, cannot be opened, or has some
+** sort of error (e.g., syntax error).
+** EX_CANTCREAT -- A (user specified) output file cannot be
+** created.
+** EX_IOERR -- An error occurred while doing I/O on some file.
+** EX_TEMPFAIL -- temporary failure, indicating something that
+** is not really an error. In sendmail, this means
+** that a mailer (e.g.) could not create a connection,
+** and the request should be reattempted later.
+** EX_PROTOCOL -- the remote system returned something that
+** was "not possible" during a protocol exchange.
+** EX_NOPERM -- You did not have sufficient permission to
+** perform the operation. This is not intended for
+** file system problems, which should use NOINPUT or
+** CANTCREAT, but rather for higher level permissions.
+*/
+
+# define EX_OK 0 /* successful termination */
+
+# define EX__BASE 64 /* base value for error messages */
+
+# define EX_USAGE 64 /* command line usage error */
+# define EX_DATAERR 65 /* data format error */
+# define EX_NOINPUT 66 /* cannot open input */
+# define EX_NOUSER 67 /* addressee unknown */
+# define EX_NOHOST 68 /* host name unknown */
+# define EX_UNAVAILABLE 69 /* service unavailable */
+# define EX_SOFTWARE 70 /* internal software error */
+# define EX_OSERR 71 /* system error (e.g., can't fork) */
+# define EX_OSFILE 72 /* critical OS file missing */
+# define EX_CANTCREAT 73 /* can't create (user) output file */
+# define EX_IOERR 74 /* input/output error */
+# define EX_TEMPFAIL 75 /* temp failure; user is invited to retry */
+# define EX_PROTOCOL 76 /* remote error in protocol */
+# define EX_NOPERM 77 /* permission denied */
+# define EX_CONFIG 78 /* configuration error */
+
+# define EX__MAX 78 /* maximum listed value */
+
+#endif /* ! _SYSEXITS_H_ */
Modified: stable/0.8/contrib/sendmail/src/timers.c
===================================================================
--- stable/0.8/contrib/sendmail/src/timers.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/timers.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -11,7 +11,7 @@
*/
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: timers.c,v 1.1.1.4 2007-11-23 22:10:30 laffer1 Exp $")
+SM_RCSID("@(#)$Id: timers.c,v 8.27 2013-11-22 20:51:57 ca Exp $")
#if _FFR_TIMERS
# include <sys/types.h>
Modified: stable/0.8/contrib/sendmail/src/timers.h
===================================================================
--- stable/0.8/contrib/sendmail/src/timers.h 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/timers.h 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2000 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2000 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -6,7 +6,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: timers.h,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $
+ * $Id: timers.h,v 8.7 2013-11-22 20:51:57 ca Exp $
*
* Contributed by Exactis.com, Inc.
*
Modified: stable/0.8/contrib/sendmail/src/tls.c
===================================================================
--- stable/0.8/contrib/sendmail/src/tls.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/tls.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2006, 2008, 2009, 2011, 2013 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2006, 2008, 2009, 2011, 2013 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -10,24 +10,24 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: tls.c,v 1.1.1.7 2013-08-14 22:35:48 laffer1 Exp $")
+SM_RCSID("@(#)$Id: tls.c,v 8.127 2013-11-27 02:51:11 gshapiro Exp $")
#if STARTTLS
-# include <openssl/err.h>
-# include <openssl/bio.h>
-# include <openssl/pem.h>
-# ifndef HASURANDOMDEV
-# include <openssl/rand.h>
-# endif /* ! HASURANDOMDEV */
+# include <openssl/err.h>
+# include <openssl/bio.h>
+# include <openssl/pem.h>
+# ifndef HASURANDOMDEV
+# include <openssl/rand.h>
+# endif /* ! HASURANDOMDEV */
# if !TLS_NO_RSA
static RSA *rsa_tmp = NULL; /* temporary RSA key */
static RSA *tmp_rsa_key __P((SSL *, int, int));
# endif /* !TLS_NO_RSA */
-# if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x00907000L
+# if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x00907000L
static int tls_verify_cb __P((X509_STORE_CTX *));
-# else /* !defined() || OPENSSL_VERSION_NUMBER < 0x00907000L */
+# else /* !defined() || OPENSSL_VERSION_NUMBER < 0x00907000L */
static int tls_verify_cb __P((X509_STORE_CTX *, void *));
-# endif /* !defined() || OPENSSL_VERSION_NUMBER < 0x00907000L */
+# endif /* !defined() || OPENSSL_VERSION_NUMBER < 0x00907000L */
# if OPENSSL_VERSION_NUMBER > 0x00907000L
static int x509_verify_cb __P((int, X509_STORE_CTX *));
@@ -41,7 +41,7 @@
static void apps_ssl_info_cb __P((CONST097 SSL *, int , int));
static bool tls_ok_f __P((char *, char *, int));
static bool tls_safe_f __P((char *, long, bool));
-static int tls_verify_log __P((int, X509_STORE_CTX *, char *));
+static int tls_verify_log __P((int, X509_STORE_CTX *, const char *));
# if !NO_DH
static DH *get_dh512 __P((void));
@@ -73,6 +73,62 @@
return NULL;
return dh;
}
+
+# if 0
+
+This is the data from which the C code has been generated:
+
+-----BEGIN DH PARAMETERS-----
+MIIBCAKCAQEArDcgcLpxEksQHPlolRKCUJ2szKRziseWV9cUSQNZGxoGw7KkROz4
+HF9QSbg5axyNIG+QbZYtx0jp3l6/GWq1dLOj27yZkgYgaYgFrvKPiZ2jJ5xETQVH
+UpZwbjRcyjyWkWYJVsx1aF4F/iY4kT0n/+iGEoimI3C9V3KXTJ2S6jIkyJ6M/CrN
+EtrDynMlUMGlc7S1ouXVOTrtKeqy3S2L9eBLxVI+sChEijGIfELupdVeXihK006p
+MgnABPDbkTx6OOtYmSZaGQX+OLW2FPmwvcrzgCz9t9cAsuUcBZv1LeHEqZZttyLU
+oK0jjSXgFyeU4/NfyA+zuNeWzUL6bHmigwIBAg==
+-----END DH PARAMETERS-----
+# endif /* 0 */
+
+static DH *
+get_dh2048()
+{
+ static unsigned char dh2048_p[]={
+ 0xAC,0x37,0x20,0x70,0xBA,0x71,0x12,0x4B,0x10,0x1C,0xF9,0x68,
+ 0x95,0x12,0x82,0x50,0x9D,0xAC,0xCC,0xA4,0x73,0x8A,0xC7,0x96,
+ 0x57,0xD7,0x14,0x49,0x03,0x59,0x1B,0x1A,0x06,0xC3,0xB2,0xA4,
+ 0x44,0xEC,0xF8,0x1C,0x5F,0x50,0x49,0xB8,0x39,0x6B,0x1C,0x8D,
+ 0x20,0x6F,0x90,0x6D,0x96,0x2D,0xC7,0x48,0xE9,0xDE,0x5E,0xBF,
+ 0x19,0x6A,0xB5,0x74,0xB3,0xA3,0xDB,0xBC,0x99,0x92,0x06,0x20,
+ 0x69,0x88,0x05,0xAE,0xF2,0x8F,0x89,0x9D,0xA3,0x27,0x9C,0x44,
+ 0x4D,0x05,0x47,0x52,0x96,0x70,0x6E,0x34,0x5C,0xCA,0x3C,0x96,
+ 0x91,0x66,0x09,0x56,0xCC,0x75,0x68,0x5E,0x05,0xFE,0x26,0x38,
+ 0x91,0x3D,0x27,0xFF,0xE8,0x86,0x12,0x88,0xA6,0x23,0x70,0xBD,
+ 0x57,0x72,0x97,0x4C,0x9D,0x92,0xEA,0x32,0x24,0xC8,0x9E,0x8C,
+ 0xFC,0x2A,0xCD,0x12,0xDA,0xC3,0xCA,0x73,0x25,0x50,0xC1,0xA5,
+ 0x73,0xB4,0xB5,0xA2,0xE5,0xD5,0x39,0x3A,0xED,0x29,0xEA,0xB2,
+ 0xDD,0x2D,0x8B,0xF5,0xE0,0x4B,0xC5,0x52,0x3E,0xB0,0x28,0x44,
+ 0x8A,0x31,0x88,0x7C,0x42,0xEE,0xA5,0xD5,0x5E,0x5E,0x28,0x4A,
+ 0xD3,0x4E,0xA9,0x32,0x09,0xC0,0x04,0xF0,0xDB,0x91,0x3C,0x7A,
+ 0x38,0xEB,0x58,0x99,0x26,0x5A,0x19,0x05,0xFE,0x38,0xB5,0xB6,
+ 0x14,0xF9,0xB0,0xBD,0xCA,0xF3,0x80,0x2C,0xFD,0xB7,0xD7,0x00,
+ 0xB2,0xE5,0x1C,0x05,0x9B,0xF5,0x2D,0xE1,0xC4,0xA9,0x96,0x6D,
+ 0xB7,0x22,0xD4,0xA0,0xAD,0x23,0x8D,0x25,0xE0,0x17,0x27,0x94,
+ 0xE3,0xF3,0x5F,0xC8,0x0F,0xB3,0xB8,0xD7,0x96,0xCD,0x42,0xFA,
+ 0x6C,0x79,0xA2,0x83,
+ };
+ static unsigned char dh2048_g[]={ 0x02, };
+ DH *dh;
+
+ if ((dh=DH_new()) == NULL)
+ return(NULL);
+ dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
+ dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
+ if ((dh->p == NULL) || (dh->g == NULL))
+ {
+ DH_free(dh);
+ return(NULL);
+ }
+ return(dh);
+}
# endif /* !NO_DH */
@@ -282,6 +338,7 @@
/* basic TLS initialization, ignore result for now */
SSL_library_init();
SSL_load_error_strings();
+ OpenSSL_add_all_algorithms();
# if 0
/* this is currently a macro for SSL_library_init */
SSLeay_add_ssl_algorithms();
@@ -310,8 +367,25 @@
}
}
#endif /* _FFR_FIPSMODE */
+ if (bv && CertFingerprintAlgorithm != NULL)
+ {
+ const EVP_MD *md;
+
+ md = EVP_get_digestbyname(CertFingerprintAlgorithm);
+ if (NULL == md)
+ {
+ bv = false;
+ if (LogLevel > 0)
+ sm_syslog(LOG_ERR, NOQID,
+ "STARTTLS=init, CertFingerprintAlgorithm=%s, status=invalid"
+ , CertFingerprintAlgorithm);
+ }
+ else
+ EVP_digest = md;
+ }
return bv;
}
+
/*
** TLS_SET_VERIFY -- request client certificate?
**
@@ -318,7 +392,7 @@
** Parameters:
** ctx -- TLS context
** ssl -- TLS structure
-** vrfy -- require certificate?
+** vrfy -- request certificate?
**
** Returns:
** none.
@@ -368,12 +442,10 @@
# define TLS_S_CRLF_EX 0x00000100 /* CRL file exists */
# define TLS_S_CRLF_OK 0x00000200 /* CRL file is ok */
-# if _FFR_TLS_1
-# define TLS_S_CERT2_EX 0x00001000 /* 2nd cert file exists */
-# define TLS_S_CERT2_OK 0x00002000 /* 2nd cert file is ok */
-# define TLS_S_KEY2_EX 0x00004000 /* 2nd key file exists */
-# define TLS_S_KEY2_OK 0x00008000 /* 2nd key file is ok */
-# endif /* _FFR_TLS_1 */
+# define TLS_S_CERT2_EX 0x00001000 /* 2nd cert file exists */
+# define TLS_S_CERT2_OK 0x00002000 /* 2nd cert file is ok */
+# define TLS_S_KEY2_EX 0x00004000 /* 2nd key file exists */
+# define TLS_S_KEY2_OK 0x00008000 /* 2nd key file is ok */
# define TLS_S_DH_OK 0x00200000 /* DH cert is ok */
# define TLS_S_DHPAR_EX 0x00400000 /* DH param file exists */
@@ -506,7 +578,110 @@
ok = false; \
}
+# if _FFR_TLS_SE_OPTS
/*
+** LOAD_CERTKEY -- load cert/key for TLS session
+**
+** Parameters:
+** ssl -- TLS session context
+** certfile -- filename of certificate
+** keyfile -- filename of private key
+**
+** Returns:
+** succeeded?
+*/
+
+bool
+load_certkey(ssl, srv, certfile, keyfile)
+ SSL *ssl;
+ bool srv;
+ char *certfile;
+ char *keyfile;
+{
+ bool ok;
+ int r;
+ long sff, status;
+ unsigned long req;
+ char *who;
+
+ ok = true;
+ who = srv ? "server" : "client";
+ status = TLS_S_NONE;
+ req = TLS_I_CERT_EX|TLS_I_KEY_EX;
+ TLS_OK_F(certfile, "CertFile", bitset(TLS_I_CERT_EX, req),
+ TLS_S_CERT_EX, srv ? TLS_T_SRV : TLS_T_CLT);
+ TLS_OK_F(keyfile, "KeyFile", bitset(TLS_I_KEY_EX, req),
+ TLS_S_KEY_EX, srv ? TLS_T_SRV : TLS_T_CLT);
+
+ /* certfile etc. must be "safe". */
+ sff = SFF_REGONLY | SFF_SAFEDIRPATH | SFF_NOWLINK
+ | SFF_NOGWFILES | SFF_NOWWFILES
+ | SFF_MUSTOWN | SFF_ROOTOK | SFF_OPENASROOT;
+ if (DontLockReadFiles)
+ sff |= SFF_NOLOCK;
+
+ TLS_SAFE_F(certfile, sff | TLS_UNR(TLS_I_CERT_UNR, req),
+ bitset(TLS_I_CERT_EX, req),
+ bitset(TLS_S_CERT_EX, status), TLS_S_CERT_OK, srv);
+ TLS_SAFE_F(keyfile, sff | TLS_KEYSFF(req),
+ bitset(TLS_I_KEY_EX, req),
+ bitset(TLS_S_KEY_EX, status), TLS_S_KEY_OK, srv);
+
+# define SSL_use_cert(ssl, certfile) \
+ SSL_use_certificate_file(ssl, certfile, SSL_FILETYPE_PEM)
+# define SSL_USE_CERT "SSL_use_certificate_file"
+
+ if (bitset(TLS_S_CERT_OK, status) &&
+ SSL_use_cert(ssl, certfile) <= 0)
+ {
+ if (LogLevel > 7)
+ {
+ sm_syslog(LOG_WARNING, NOQID,
+ "STARTTLS=%s, error: %s(%s) failed",
+ who, SSL_USE_CERT, certfile);
+ if (LogLevel > 9)
+ tlslogerr(LOG_WARNING, who);
+ }
+ if (bitset(TLS_I_USE_CERT, req))
+ return false;
+ }
+ if (bitset(TLS_S_KEY_OK, status) &&
+ SSL_use_PrivateKey_file(ssl, keyfile, SSL_FILETYPE_PEM) <= 0)
+ {
+ if (LogLevel > 7)
+ {
+ sm_syslog(LOG_WARNING, NOQID,
+ "STARTTLS=%s, error: SSL_use_PrivateKey_file(%s) failed",
+ who, keyfile);
+ if (LogLevel > 9)
+ tlslogerr(LOG_WARNING, who);
+ }
+ if (bitset(TLS_I_USE_KEY, req))
+ return false;
+ }
+
+ /* check the private key */
+ if (bitset(TLS_S_KEY_OK, status) &&
+ (r = SSL_check_private_key(ssl)) <= 0)
+ {
+ /* Private key does not match the certificate public key */
+ if (LogLevel > 5)
+ {
+ sm_syslog(LOG_WARNING, NOQID,
+ "STARTTLS=%s, error: SSL_check_private_key failed(%s): %d",
+ who, keyfile, r);
+ if (LogLevel > 9)
+ tlslogerr(LOG_WARNING, who);
+ }
+ if (bitset(TLS_I_USE_KEY, req))
+ return false;
+ }
+
+ return true;
+}
+# endif /* _FFR_TLS_SE_OPTS */
+
+/*
** INITTLS -- initialize TLS
**
** Parameters:
@@ -544,7 +719,7 @@
inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhparam)
SSL_CTX **ctx;
unsigned long req;
- long options;
+ unsigned long options;
bool srv;
char *certfile, *keyfile, *cacertpath, *cacertfile, *dhparam;
{
@@ -555,12 +730,10 @@
bool ok;
long sff, status;
char *who;
-# if _FFR_TLS_1
char *cf2, *kf2;
-# endif /* _FFR_TLS_1 */
-# if SM_CONF_SHM
+# if SM_CONF_SHM
extern int ShmId;
-# endif /* SM_CONF_SHM */
+# endif /* SM_CONF_SHM */
# if OPENSSL_VERSION_NUMBER > 0x00907000L
BIO *crl_file;
X509_CRL *crl;
@@ -585,7 +758,6 @@
return true;
ok = true;
-# if _FFR_TLS_1
/*
** look for a second filename: it must be separated by a ','
** no blanks allowed (they won't be skipped).
@@ -604,7 +776,6 @@
if (keyfile != NULL && (kf2 = strchr(keyfile, ',')) != NULL)
*kf2++ = '\0';
}
-# endif /* _FFR_TLS_1 */
/*
** Check whether files/paths are defined
@@ -624,7 +795,6 @@
TLS_S_CRLF_EX, TLS_T_OTHER);
# endif /* OPENSSL_VERSION_NUMBER > 0x00907000L */
-# if _FFR_TLS_1
/*
** if the second file is specified it must exist
** XXX: it is possible here to define only one of those files
@@ -640,17 +810,23 @@
TLS_OK_F(kf2, "KeyFile", bitset(TLS_I_KEY_EX, req),
TLS_S_KEY2_EX, srv ? TLS_T_SRV : TLS_T_CLT);
}
-# endif /* _FFR_TLS_1 */
/*
** valid values for dhparam are (only the first char is checked)
** none no parameters: don't use DH
- ** 512 generate 512 bit parameters (fixed)
+ ** i use precomputed 2048 bit parameters
+ ** 512 use precomputed 512 bit parameters
** 1024 generate 1024 bit parameters
+ ** 2048 generate 2048 bit parameters
** /file/name read parameters from /file/name
- ** default is: 1024
*/
+#define SET_DH_DFL \
+ do { \
+ dhparam = "I"; \
+ req |= TLS_I_DHFIXED; \
+ } while (0)
+
if (bitset(TLS_I_TRY_DH, req))
{
if (dhparam != NULL)
@@ -659,22 +835,25 @@
if (c == '1')
req |= TLS_I_DH1024;
+ else if (c == 'I' || c == 'i')
+ req |= TLS_I_DHFIXED;
+ else if (c == '2')
+ req |= TLS_I_DH2048;
else if (c == '5')
req |= TLS_I_DH512;
- else if (c != 'n' && c != 'N' && c != '/')
+ else if (c == 'n' || c == 'N')
+ req &= ~TLS_I_TRY_DH;
+ else if (c != '/')
{
if (LogLevel > 12)
sm_syslog(LOG_WARNING, NOQID,
- "STARTTLS=%s, error: illegal value '%s' for DHParam",
+ "STARTTLS=%s, error: illegal value '%s' for DHParameters",
who, dhparam);
dhparam = NULL;
}
}
if (dhparam == NULL)
- {
- dhparam = "1";
- req |= TLS_I_DH1024;
- }
+ SET_DH_DFL;
else if (*dhparam == '/')
{
TLS_OK_F(dhparam, "DHParameters",
@@ -701,9 +880,14 @@
TLS_SAFE_F(cacertfile, sff | TLS_UNR(TLS_I_CERTF_UNR, req),
bitset(TLS_I_CERTF_EX, req),
bitset(TLS_S_CERTF_EX, status), TLS_S_CERTF_OK, srv);
- TLS_SAFE_F(dhparam, sff | TLS_UNR(TLS_I_DHPAR_UNR, req),
- bitset(TLS_I_DHPAR_EX, req),
- bitset(TLS_S_DHPAR_EX, status), TLS_S_DHPAR_OK, srv);
+ if (dhparam != NULL && *dhparam == '/')
+ {
+ TLS_SAFE_F(dhparam, sff | TLS_UNR(TLS_I_DHPAR_UNR, req),
+ bitset(TLS_I_DHPAR_EX, req),
+ bitset(TLS_S_DHPAR_EX, status), TLS_S_DHPAR_OK, srv);
+ if (!bitset(TLS_S_DHPAR_OK, status))
+ SET_DH_DFL;
+ }
# if OPENSSL_VERSION_NUMBER > 0x00907000L
TLS_SAFE_F(CRLFile, sff | TLS_UNR(TLS_I_CRLF_UNR, req),
bitset(TLS_I_CRLF_EX, req),
@@ -711,7 +895,6 @@
# endif /* OPENSSL_VERSION_NUMBER > 0x00907000L */
if (!ok)
return ok;
-# if _FFR_TLS_1
if (cf2 != NULL)
{
TLS_SAFE_F(cf2, sff | TLS_UNR(TLS_I_CERT_UNR, req),
@@ -724,7 +907,6 @@
bitset(TLS_I_KEY_EX, req),
bitset(TLS_S_KEY2_EX, status), TLS_S_KEY2_OK, srv);
}
-# endif /* _FFR_TLS_1 */
/* create a method and a new context */
if ((*ctx = SSL_CTX_new(srv ? SSLv23_server_method() :
@@ -819,13 +1001,13 @@
*/
if (bitset(TLS_I_RSA_TMP, req)
-# if SM_CONF_SHM
+# if SM_CONF_SHM
&& ShmId != SM_SHM_NO_ID &&
(rsa_tmp = RSA_generate_key(RSA_KEYLENGTH, RSA_F4, NULL,
NULL)) == NULL
-# else /* SM_CONF_SHM */
+# else /* SM_CONF_SHM */
&& 0 /* no shared memory: no need to generate key now */
-# endif /* SM_CONF_SHM */
+# endif /* SM_CONF_SHM */
)
{
if (LogLevel > 7)
@@ -861,16 +1043,25 @@
return false;
}
+#if _FFR_TLS_USE_CERTIFICATE_CHAIN_FILE
+# define SSL_CTX_use_cert(ssl_ctx, certfile) \
+ SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile)
+# define SSL_CTX_USE_CERT "SSL_CTX_use_certificate_chain_file"
+#else
+# define SSL_CTX_use_cert(ssl_ctx, certfile) \
+ SSL_CTX_use_certificate_file(ssl_ctx, certfile, SSL_FILETYPE_PEM)
+# define SSL_CTX_USE_CERT "SSL_CTX_use_certificate_file"
+#endif
+
/* get the certificate file */
if (bitset(TLS_S_CERT_OK, status) &&
- SSL_CTX_use_certificate_file(*ctx, certfile,
- SSL_FILETYPE_PEM) <= 0)
+ SSL_CTX_use_cert(*ctx, certfile) <= 0)
{
if (LogLevel > 7)
{
sm_syslog(LOG_WARNING, NOQID,
- "STARTTLS=%s, error: SSL_CTX_use_certificate_file(%s) failed",
- who, certfile);
+ "STARTTLS=%s, error: %s(%s) failed",
+ who, SSL_CTX_USE_CERT, certfile);
if (LogLevel > 9)
tlslogerr(LOG_WARNING, who);
}
@@ -895,7 +1086,6 @@
return false;
}
-# if _FFR_TLS_1
/* XXX this code is pretty much duplicated from above! */
/* load private key */
@@ -914,13 +1104,13 @@
/* get the certificate file */
if (bitset(TLS_S_CERT2_OK, status) &&
- SSL_CTX_use_certificate_file(*ctx, cf2, SSL_FILETYPE_PEM) <= 0)
+ SSL_CTX_use_cert(*ctx, cf2) <= 0)
{
if (LogLevel > 7)
{
sm_syslog(LOG_WARNING, NOQID,
- "STARTTLS=%s, error: SSL_CTX_use_certificate_file(%s) failed",
- who, cf2);
+ "STARTTLS=%s, error: %s(%s) failed",
+ who, SSL_CTX_USE_CERT, cf2);
if (LogLevel > 9)
tlslogerr(LOG_WARNING, who);
}
@@ -940,7 +1130,6 @@
tlslogerr(LOG_WARNING, who);
}
}
-# endif /* _FFR_TLS_1 */
/* SSL_CTX_set_quiet_shutdown(*ctx, 1); violation of standard? */
@@ -964,12 +1153,19 @@
options &= ~SSL_OP_TLS_BLOCK_PADDING_BUG;
}
#endif
- SSL_CTX_set_options(*ctx, options);
+ SSL_CTX_set_options(*ctx, (long) options);
# if !NO_DH
/* Diffie-Hellman initialization */
if (bitset(TLS_I_TRY_DH, req))
{
+#if _FFR_TLS_EC
+ EC_KEY *ecdh;
+#endif /* _FFR_TLS_EC */
+
+ if (tTd(96, 8))
+ sm_dprintf("inittls: req=%#lx, status=%#lx\n",
+ req, status);
if (bitset(TLS_S_DHPAR_OK, status))
{
BIO *bio;
@@ -989,6 +1185,7 @@
ERR_error_string(err, NULL));
if (LogLevel > 9)
tlslogerr(LOG_WARNING, who);
+ SET_DH_DFL;
}
}
else
@@ -1003,19 +1200,33 @@
}
}
}
- if (dh == NULL && bitset(TLS_I_DH1024, req))
+ if (dh == NULL && bitset(TLS_I_DH1024|TLS_I_DH2048, req))
{
+ int bits;
DSA *dsa;
- /* this takes a while! (7-130s on a 450MHz AMD K6-2) */
- dsa = DSA_generate_parameters(1024, NULL, 0, NULL,
+ bits = bitset(TLS_I_DH2048, req) ? 2048 : 1024;
+ if (tTd(96, 2))
+ sm_dprintf("inittls: Generating %d bit DH parameters\n", bits);
+
+ /* this takes a while! */
+ dsa = DSA_generate_parameters(bits, NULL, 0, NULL,
NULL, 0, NULL);
dh = DSA_dup_DH(dsa);
DSA_free(dsa);
}
- else
- if (dh == NULL && bitset(TLS_I_DH512, req))
+ else if (dh == NULL && bitset(TLS_I_DHFIXED, req))
+ {
+ if (tTd(96, 2))
+ sm_dprintf("inittls: Using precomputed 2048 bit DH parameters\n");
+ dh = get_dh2048();
+ }
+ else if (dh == NULL && bitset(TLS_I_DH512, req))
+ {
+ if (tTd(96, 2))
+ sm_dprintf("inittls: Using precomputed 512 bit DH parameters\n");
dh = get_dh512();
+ }
if (dh == NULL)
{
@@ -1034,10 +1245,10 @@
}
else
{
- SSL_CTX_set_tmp_dh(*ctx, dh);
-
/* important to avoid small subgroup attacks */
SSL_CTX_set_options(*ctx, SSL_OP_SINGLE_DH_USE);
+
+ SSL_CTX_set_tmp_dh(*ctx, dh);
if (LogLevel > 13)
sm_syslog(LOG_INFO, NOQID,
"STARTTLS=%s, Diffie-Hellman init, key=%d bit (%c)",
@@ -1044,6 +1255,17 @@
who, 8 * DH_size(dh), *dhparam);
DH_free(dh);
}
+
+#if _FFR_TLS_EC
+ ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
+ if (ecdh != NULL)
+ {
+ SSL_CTX_set_options(*ctx, SSL_OP_SINGLE_ECDH_USE);
+ SSL_CTX_set_tmp_ecdh(*ctx, ecdh);
+ EC_KEY_free(ecdh);
+ }
+#endif /* _FFR_TLS_EC */
+
}
# endif /* !NO_DH */
@@ -1126,7 +1348,6 @@
if (tTd(96, 9))
SSL_CTX_set_info_callback(*ctx, apps_ssl_info_cb);
-# if _FFR_TLS_1
/* install our own cipher list */
if (CipherList != NULL && *CipherList != '\0')
{
@@ -1144,12 +1365,11 @@
/* failure if setting to this list is required? */
}
}
-# endif /* _FFR_TLS_1 */
+
if (LogLevel > 12)
sm_syslog(LOG_INFO, NOQID, "STARTTLS=%s, init=%d", who, ok);
-# if _FFR_TLS_1
-# if 0
+# if 0
/*
** this label is required if we want to have a "clean" exit
** see the comments above at the initialization of cf2
@@ -1156,7 +1376,7 @@
*/
endinittls:
-# endif /* 0 */
+# endif /* 0 */
/* undo damage to global variables */
if (cf2 != NULL)
@@ -1163,11 +1383,56 @@
*--cf2 = ',';
if (kf2 != NULL)
*--kf2 = ',';
-# endif /* _FFR_TLS_1 */
return ok;
}
+
/*
+** CERT_FP -- get cert fingerprint
+**
+** Parameters:
+** cert -- TLS cert
+** mac -- macro storage
+** macro -- where to store cert fp
+**
+** Returns:
+** <=0: cert fp calculation failed
+** >0: cert fp calculation ok
+*/
+
+static int
+cert_fp(cert, evp_digest, mac, macro)
+ X509 *cert;
+ const EVP_MD *evp_digest;
+ MACROS_T *mac;
+ char *macro;
+{
+ unsigned int n;
+ int r;
+ unsigned char md[EVP_MAX_MD_SIZE];
+ char md5h[EVP_MAX_MD_SIZE * 3];
+ static const char hexcodes[] = "0123456789ABCDEF";
+
+ n = 0;
+ if (X509_digest(cert, EVP_digest, md, &n) == 0 || n <= 0)
+ {
+ macdefine(mac, A_TEMP, macid(macro), "");
+ return 0;
+ }
+
+ SM_ASSERT((n * 3) + 2 < sizeof(md5h));
+ for (r = 0; r < (int) n; r++)
+ {
+ md5h[r * 3] = hexcodes[(md[r] & 0xf0) >> 4];
+ md5h[(r * 3) + 1] = hexcodes[(md[r] & 0x0f)];
+ md5h[(r * 3) + 2] = ':';
+ }
+ md5h[(n * 3) - 1] = '\0';
+ macdefine(mac, A_TEMP, macid(macro), md5h);
+ return 1;
+}
+
+/*
** TLS_GET_INFO -- get information about TLS connection
**
** Parameters:
@@ -1181,9 +1446,7 @@
** result of authentication.
**
** Side Effects:
-** sets macros: {cipher}, {tls_version}, {verify},
-** {cipher_bits}, {alg_bits}, {cert}, {cert_subject},
-** {cert_issuer}, {cn_subject}, {cn_issuer}
+** sets various TLS related macros.
*/
int
@@ -1211,7 +1474,7 @@
macdefine(mac, A_TEMP, macid("{cipher_bits}"), bitstr);
(void) sm_snprintf(bitstr, sizeof(bitstr), "%d", r);
macdefine(mac, A_TEMP, macid("{alg_bits}"), bitstr);
- s = SSL_CIPHER_get_version(c);
+ s = (char *) SSL_get_version(ssl);
if (s == NULL)
s = "UNKNOWN";
macdefine(mac, A_TEMP, macid("{tls_version}"), s);
@@ -1225,9 +1488,7 @@
who, verifyok, (unsigned long) cert);
if (cert != NULL)
{
- unsigned int n;
X509_NAME *subj, *issuer;
- unsigned char md[EVP_MAX_MD_SIZE];
char buf[MAXNAME];
subj = X509_get_subject_name(cert);
@@ -1241,6 +1502,8 @@
# define LL_BADCERT 8
+#define CERTFPMACRO (CertFingerprintAlgorithm != NULL ? "{cert_fp}" : "{cert_md5}")
+
#define CHECK_X509_NAME(which) \
do { \
if (r == -1) \
@@ -1286,24 +1549,7 @@
CHECK_X509_NAME("cn_issuer");
macdefine(mac, A_TEMP, macid("{cn_issuer}"),
xtextify(buf, "<>\")"));
- n = 0;
- if (X509_digest(cert, EVP_md5(), md, &n) != 0 && n > 0)
- {
- char md5h[EVP_MAX_MD_SIZE * 3];
- static const char hexcodes[] = "0123456789ABCDEF";
-
- SM_ASSERT((n * 3) + 2 < sizeof(md5h));
- for (r = 0; r < (int) n; r++)
- {
- md5h[r * 3] = hexcodes[(md[r] & 0xf0) >> 4];
- md5h[(r * 3) + 1] = hexcodes[(md[r] & 0x0f)];
- md5h[(r * 3) + 2] = ':';
- }
- md5h[(n * 3) - 1] = '\0';
- macdefine(mac, A_TEMP, macid("{cert_md5}"), md5h);
- }
- else
- macdefine(mac, A_TEMP, macid("{cert_md5}"), "");
+ (void) cert_fp(cert, EVP_digest, mac, CERTFPMACRO);
}
else
{
@@ -1311,7 +1557,7 @@
macdefine(mac, A_PERM, macid("{cert_issuer}"), "");
macdefine(mac, A_PERM, macid("{cn_subject}"), "");
macdefine(mac, A_PERM, macid("{cn_issuer}"), "");
- macdefine(mac, A_TEMP, macid("{cert_md5}"), "");
+ macdefine(mac, A_TEMP, macid(CERTFPMACRO), "");
}
switch (verifyok)
{
@@ -1606,9 +1852,9 @@
** Parameters:
** ok -- verify ok?
** ctx -- x509 context
+** name -- from where is this called?
**
** Returns:
-** 0 -- fatal error
** 1 -- ok
*/
@@ -1616,9 +1862,8 @@
tls_verify_log(ok, ctx, name)
int ok;
X509_STORE_CTX *ctx;
- char *name;
+ const char *name;
{
- SSL *ssl;
X509 *cert;
int reason, depth;
char buf[512];
@@ -1626,17 +1871,6 @@
cert = X509_STORE_CTX_get_current_cert(ctx);
reason = X509_STORE_CTX_get_error(ctx);
depth = X509_STORE_CTX_get_error_depth(ctx);
- ssl = (SSL *) X509_STORE_CTX_get_ex_data(ctx,
- SSL_get_ex_data_X509_STORE_CTX_idx());
-
- if (ssl == NULL)
- {
- /* internal error */
- sm_syslog(LOG_ERR, NOQID,
- "STARTTLS: internal error: tls_verify_cb: ssl == NULL");
- return 0;
- }
-
X509_NAME_oneline(X509_get_subject_name(cert), buf, sizeof(buf));
sm_syslog(LOG_INFO, NOQID,
"STARTTLS: %s cert verify: depth=%d %s, state=%d, reason=%s",
@@ -1702,10 +1936,10 @@
unsigned long es;
char *file, *data;
char buf[256];
-# define CP (const char **)
es = CRYPTO_thread_id();
- while ((l = ERR_get_error_line_data(CP &file, &line, CP &data, &flags))
+ while ((l = ERR_get_error_line_data((const char **) &file, &line,
+ (const char **) &data, &flags))
!= 0)
{
sm_syslog(level, NOQID,
Modified: stable/0.8/contrib/sendmail/src/trace.c
===================================================================
--- stable/0.8/contrib/sendmail/src/trace.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/trace.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -15,7 +15,7 @@
#include <sm/debug.h>
#include <sm/string.h>
-SM_RCSID("@(#)$Id: trace.c,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $")
+SM_RCSID("@(#)$Id: trace.c,v 8.39 2013-11-22 20:51:57 ca Exp $")
static char *tTnewflag __P((char *));
static char *tToldflag __P((char *));
Modified: stable/0.8/contrib/sendmail/src/udb.c
===================================================================
--- stable/0.8/contrib/sendmail/src/udb.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/udb.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2003, 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2003, 2006 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -15,9 +15,9 @@
#include "map.h"
#if USERDB
-SM_RCSID("@(#)$Id: udb.c,v 1.1.1.5 2011-05-17 22:19:51 laffer1 Exp $ (with USERDB)")
+SM_RCSID("@(#)$Id: udb.c,v 8.166 2013-11-22 20:51:57 ca Exp $ (with USERDB)")
#else /* USERDB */
-SM_RCSID("@(#)$Id: udb.c,v 1.1.1.5 2011-05-17 22:19:51 laffer1 Exp $ (without USERDB)")
+SM_RCSID("@(#)$Id: udb.c,v 8.166 2013-11-22 20:51:57 ca Exp $ (without USERDB)")
#endif /* USERDB */
#if USERDB
Modified: stable/0.8/contrib/sendmail/src/usersmtp.c
===================================================================
--- stable/0.8/contrib/sendmail/src/usersmtp.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/usersmtp.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2006, 2008-2010 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2006, 2008-2010, 2014 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: usersmtp.c,v 1.1.1.8 2013-08-14 22:35:48 laffer1 Exp $")
+SM_RCSID("@(#)$Id: usersmtp.c,v 8.488 2013-11-22 20:51:57 ca Exp $")
#include <sysexits.h>
@@ -92,6 +92,11 @@
CurHostName = MyHostName;
SmtpNeedIntro = true;
state = mci->mci_state;
+#if _FFR_ERRCODE
+ e->e_rcode = 0;
+ e->e_renhsc[0] = '\0';
+ e->e_text = NULL;
+#endif /* _FFR_ERRCODE */
switch (state)
{
case MCIS_MAIL:
@@ -227,10 +232,7 @@
*/
if ((UseMSP && Verbose && bitset(MCIF_VERB, mci->mci_flags))
-# if !_FFR_DEPRECATE_MAILER_FLAG_I
- || bitnset(M_INTERNAL, m->m_flags)
-# endif /* !_FFR_DEPRECATE_MAILER_FLAG_I */
- )
+ || bitnset(M_INTERNAL, m->m_flags))
{
/* tell it to be verbose */
smtpmessage("VERB", m, mci);
@@ -524,15 +526,15 @@
static sasl_callback_t callbacks[] =
{
- { SASL_CB_GETREALM, &saslgetrealm, NULL },
+ { SASL_CB_GETREALM, (sasl_callback_ft)&saslgetrealm, NULL },
#define CB_GETREALM_IDX 0
- { SASL_CB_PASS, &getsecret, NULL },
+ { SASL_CB_PASS, (sasl_callback_ft)&getsecret, NULL },
#define CB_PASS_IDX 1
- { SASL_CB_USER, &getsimple, NULL },
+ { SASL_CB_USER, (sasl_callback_ft)&getsimple, NULL },
#define CB_USER_IDX 2
- { SASL_CB_AUTHNAME, &getsimple, NULL },
+ { SASL_CB_AUTHNAME, (sasl_callback_ft)&getsimple, NULL },
#define CB_AUTHNAME_IDX 3
- { SASL_CB_VERIFYFILE, &safesaslfile, NULL },
+ { SASL_CB_VERIFYFILE, (sasl_callback_ft)&safesaslfile, NULL },
#define CB_SAFESASL_IDX 4
{ SASL_CB_LIST_END, NULL, NULL }
};
@@ -768,9 +770,7 @@
pid = -1;
sff = SFF_REGONLY|SFF_SAFEDIRPATH|SFF_NOWLINK
|SFF_NOGWFILES|SFF_NOWWFILES|SFF_NOWRFILES;
-# if _FFR_GROUPREADABLEAUTHINFOFILE
if (!bitnset(DBS_GROUPREADABLEAUTHINFOFILE, DontBlameSendmail))
-# endif /* _FFR_GROUPREADABLEAUTHINFOFILE */
sff |= SFF_NOGRFILES;
if (DontLockReadFiles)
sff |= SFF_NOLOCK;
@@ -2770,7 +2770,10 @@
writeerr:
mci->mci_errno = errno;
mci->mci_state = MCIS_ERROR;
- mci_setstat(mci, EX_TEMPFAIL, "4.4.2", NULL);
+ mci_setstat(mci, bitset(MCIF_NOTSTICKY, mci->mci_flags)
+ ? EX_NOTSTICKY: EX_TEMPFAIL,
+ "4.4.2", NULL);
+ mci->mci_flags &= ~MCIF_NOTSTICKY;
/*
** If putbody() couldn't finish due to a timeout,
@@ -2782,7 +2785,7 @@
(void) bfrewind(e->e_dfp);
errno = mci->mci_errno;
- syserr("451 4.4.1 timeout writing message to %s", CurHostName);
+ syserr("+451 4.4.1 timeout writing message to %s", CurHostName);
smtpquit(m, mci, e);
return EX_TEMPFAIL;
}
@@ -3085,7 +3088,7 @@
*/
bufp = SmtpReplyBuffer;
- set_tls_rd_tmo(timeout);
+ (void) set_tls_rd_tmo(timeout);
for (;;)
{
register char *p;
@@ -3247,7 +3250,49 @@
firstline = false;
continue;
}
+#if _FFR_ERRCODE
+# if _FFR_PROXY
+ if ((e->e_rcode == 0 || REPLYTYPE(e->e_rcode) < 5)
+ && REPLYTYPE(r) > 3 && firstline)
+# endif
+# if _FFR_LOGREPLY
+ if (REPLYTYPE(r) > 3 && firstline)
+# endif
+ {
+ int o = -1;
+# if PIPELINING
+ /*
+ ** ignore error iff: DATA, 5xy error, but we had
+ ** "retryable" recipients. XREF: smtpdata()
+ */
+ if (!(rtype == XS_DATA && REPLYTYPE(r) == 5 &&
+ mci->mci_okrcpts <= 0 && mci->mci_retryrcpt))
+# endif /* PIPELINING */
+ {
+ o = extenhsc(bufp + 4, ' ', enhstatcode);
+ if (o > 0)
+ {
+ sm_strlcpy(e->e_renhsc, enhstatcode,
+ sizeof(e->e_renhsc));
+
+ /* skip SMTP reply code, delimiters */
+ o += 5;
+ }
+ else
+ o = 4;
+ e->e_rcode = r;
+ e->e_text = sm_rpool_strdup_x(e->e_rpool,
+ bufp + o);
+ }
+ if (tTd(87, 2))
+ {
+ sm_dprintf("user: offset=%d, bufp=%s, rcode=%d, enhstat=%s, text=%s\n",
+ o, bufp, r, e->e_renhsc, e->e_text);
+ }
+ }
+#endif /* _FFR_ERRCODE */
+
firstline = false;
/* if no continuation lines, return this line */
Modified: stable/0.8/contrib/sendmail/src/util.c
===================================================================
--- stable/0.8/contrib/sendmail/src/util.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/util.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2007, 2009 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2007, 2009 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: util.c,v 1.1.1.7 2013-08-14 22:35:48 laffer1 Exp $")
+SM_RCSID("@(#)$Id: util.c,v 8.427 2013-11-22 20:51:57 ca Exp $")
#include <sm/sendmail.h>
#include <sysexits.h>
@@ -1833,7 +1833,7 @@
}
(void) sm_snprintf(p, SPACELEFT(buf, p), "mode=%o: ",
- (int) st.st_mode);
+ (unsigned int) st.st_mode);
p += strlen(p);
switch (st.st_mode & S_IFMT)
{
@@ -1936,11 +1936,11 @@
default:
defprint:
(void) sm_snprintf(p, SPACELEFT(buf, p),
- "dev=%d/%d, ino=%llu, nlink=%d, u/gid=%d/%d, ",
- major(st.st_dev), minor(st.st_dev),
+ "dev=%ld/%ld, ino=%llu, nlink=%d, u/gid=%ld/%ld, ",
+ (long) major(st.st_dev), (long) minor(st.st_dev),
(ULONGLONG_T) st.st_ino,
- (int) st.st_nlink, (int) st.st_uid,
- (int) st.st_gid);
+ (int) st.st_nlink, (long) st.st_uid,
+ (long) st.st_gid);
p += strlen(p);
(void) sm_snprintf(p, SPACELEFT(buf, p), "size=%llu",
(ULONGLONG_T) st.st_size);
@@ -2866,3 +2866,139 @@
return n;
}
+#if _FFR_XCNCT
+/*
+** XCONNECT -- get X-CONNECT info
+**
+** Parameters:
+** inchannel -- FILE to check
+**
+** Returns:
+** -1 on error
+** 0 if X-CONNECT was not given
+** >0 if X-CONNECT was used successfully (D_XCNCT*)
+*/
+
+int
+xconnect(inchannel)
+ SM_FILE_T *inchannel;
+{
+ int r, i;
+ char *p, *b, delim, inp[MAXINPLINE];
+ SOCKADDR addr;
+ char **pvp;
+ char pvpbuf[PSBUFSIZE];
+ char *peerhostname; /* name of SMTP peer or "localhost" */
+ extern ENVELOPE BlankEnvelope;
+
+#define XCONNECT "X-CONNECT "
+#define XCNNCTLEN (sizeof(XCONNECT) - 1)
+
+ /* Ask the ruleset whether to use x-connect */
+ pvp = NULL;
+ peerhostname = RealHostName;
+ if (peerhostname == NULL)
+ peerhostname = "localhost";
+ r = rscap("x_connect", peerhostname,
+ anynet_ntoa(&RealHostAddr), &BlankEnvelope,
+ &pvp, pvpbuf, sizeof(pvpbuf));
+ if (tTd(75, 8))
+ sm_syslog(LOG_INFO, NOQID, "x-connect: rscap=%d", r);
+ if (r == EX_UNAVAILABLE)
+ return 0;
+ if (r != EX_OK)
+ {
+ /* ruleset error */
+ sm_syslog(LOG_INFO, NOQID, "x-connect: rscap=%d", r);
+ return 0;
+ }
+ if (pvp != NULL && pvp[0] != NULL && (pvp[0][0] & 0377) == CANONNET)
+ {
+ /* $#: no x-connect */
+ if (tTd(75, 7))
+ sm_syslog(LOG_INFO, NOQID, "x-connect: nope");
+ return 0;
+ }
+
+ p = sfgets(inp, sizeof(inp), InChannel, TimeOuts.to_nextcommand, "pre");
+ if (tTd(75, 6))
+ sm_syslog(LOG_INFO, NOQID, "x-connect: input=%s", p);
+ if (p == NULL || strncasecmp(p, XCONNECT, XCNNCTLEN) != 0)
+ return -1;
+ p += XCNNCTLEN;
+ while (isascii(*p) && isspace(*p))
+ p++;
+
+ /* parameters: IPAddress [Hostname[ M]] */
+ b = p;
+ while (*p != '\0' && isascii(*p) &&
+ (isalnum(*p) || *p == '.' || *p== ':'))
+ p++;
+ delim = *p;
+ *p = '\0';
+
+ memset(&addr, '\0', sizeof(addr));
+ addr.sin.sin_addr.s_addr = inet_addr(b);
+ if (addr.sin.sin_addr.s_addr != INADDR_NONE)
+ {
+ addr.sa.sa_family = AF_INET;
+ memcpy(&RealHostAddr, &addr, sizeof(addr));
+ if (tTd(75, 2))
+ sm_syslog(LOG_INFO, NOQID, "x-connect: addr=%s",
+ anynet_ntoa(&RealHostAddr));
+ }
+# if NETINET6
+ else if ((r = inet_pton(AF_INET6, b, &addr.sin6.sin6_addr)) == 1)
+ {
+ addr.sa.sa_family = AF_INET6;
+ memcpy(&RealHostAddr, &addr, sizeof(addr));
+ }
+# endif /* NETINET6 */
+ else
+ return -1;
+
+ /* more parameters? */
+ if (delim != ' ')
+ return D_XCNCT;
+ while (*p != '\0' && isascii(*p) && isspace(*p))
+ p++;
+
+ for (b = ++p, i = 0;
+ *p != '\0' && isascii(*p) && (isalnum(*p) || *p == '.' || *p == '-');
+ p++, i++)
+ ;
+ if (i == 0)
+ return D_XCNCT;
+ delim = *p;
+ if (i > MAXNAME)
+ b[MAXNAME] = '\0';
+ else
+ b[i] = '\0';
+ SM_FREE_CLR(RealHostName);
+ RealHostName = newstr(b);
+ if (tTd(75, 2))
+ sm_syslog(LOG_INFO, NOQID, "x-connect: host=%s", b);
+ *p = delim;
+
+ b = p;
+ if (*p != ' ')
+ return D_XCNCT;
+
+ while (*p != '\0' && isascii(*p) && isspace(*p))
+ p++;
+
+ if (tTd(75, 4))
+ {
+ char *e;
+
+ e = strpbrk(p, "\r\n");
+ if (e != NULL)
+ *e = '\0';
+ sm_syslog(LOG_INFO, NOQID, "x-connect: rest=%s", p);
+ }
+ if (*p == 'M')
+ return D_XCNCT_M;
+
+ return D_XCNCT;
+}
+#endif /* _FFR_XCNCT */
Modified: stable/0.8/contrib/sendmail/src/version.c
===================================================================
--- stable/0.8/contrib/sendmail/src/version.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/src/version.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2013 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2015 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -13,6 +13,6 @@
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: version.c,v 1.1.1.9 2013-08-14 22:35:48 laffer1 Exp $")
+SM_RCSID("@(#)$Id: version.c,v 8.250 2014-01-27 12:55:16 ca Exp $")
-char Version[] = "8.14.7";
+char Version[] = "8.15.2";
Modified: stable/0.8/contrib/sendmail/test/Makefile
===================================================================
--- stable/0.8/contrib/sendmail/test/Makefile 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/test/Makefile 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+# $Id: Makefile,v 1.2 2006-05-30 18:50:26 ca Exp $
SHELL= /bin/sh
BUILD= ./Build
Modified: stable/0.8/contrib/sendmail/test/Makefile.m4
===================================================================
--- stable/0.8/contrib/sendmail/test/Makefile.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/test/Makefile.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-dnl $Id: Makefile.m4,v 1.1.1.3 2013-08-14 22:35:47 laffer1 Exp $
+dnl $Id: Makefile.m4,v 1.6 2013-04-01 21:04:29 ca Exp $
include(confBUILDTOOLSDIR`/M4/switch.m4')
bldPRODUCT_START(`executable', `test')
Modified: stable/0.8/contrib/sendmail/test/README
===================================================================
--- stable/0.8/contrib/sendmail/test/README 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/test/README 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -5,7 +5,7 @@
# forth in the LICENSE file which can be found at the top level of
# the sendmail distribution.
#
-# $Id: README,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $
+# $Id: README,v 1.3 2013-11-22 20:52:01 ca Exp $
#
This directory contains several programs to test various OS calls.
Modified: stable/0.8/contrib/sendmail/test/Results
===================================================================
--- stable/0.8/contrib/sendmail/test/Results 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/test/Results 2016-10-01 17:46:48 UTC (rev 9102)
@@ -195,4 +195,4 @@
SunOS 5.9 HASSETREGID 2001-09-22 Neil W Rickert
-$Revision: 1.1.1.2 $, Last updated $Date: 2006-02-25 02:34:00 $
+$Revision: 8.3 $, Last updated $Date: 2001-09-30 01:32:33 $
Modified: stable/0.8/contrib/sendmail/test/t_dropgid.c
===================================================================
--- stable/0.8/contrib/sendmail/test/t_dropgid.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/test/t_dropgid.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -22,7 +22,7 @@
#include <stdio.h>
#ifndef lint
-static char id[] = "@(#)$Id: t_dropgid.c,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $";
+static char id[] = "@(#)$Id: t_dropgid.c,v 1.7 2013-11-22 20:52:01 ca Exp $";
#endif /* ! lint */
static void
Modified: stable/0.8/contrib/sendmail/test/t_exclopen.c
===================================================================
--- stable/0.8/contrib/sendmail/test/t_exclopen.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/test/t_exclopen.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -46,7 +46,7 @@
#include <unistd.h>
#ifndef lint
-static char id[] = "@(#)$Id: t_exclopen.c,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $";
+static char id[] = "@(#)$Id: t_exclopen.c,v 8.7 2013-11-22 20:52:01 ca Exp $";
#endif /* ! lint */
static char Attacker[128];
Modified: stable/0.8/contrib/sendmail/test/t_pathconf.c
===================================================================
--- stable/0.8/contrib/sendmail/test/t_pathconf.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/test/t_pathconf.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -26,7 +26,7 @@
#include <sysexits.h>
#ifndef lint
-static char id[] = "@(#)$Id: t_pathconf.c,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $";
+static char id[] = "@(#)$Id: t_pathconf.c,v 8.7 2013-11-22 20:52:01 ca Exp $";
#endif /* ! lint */
int
Modified: stable/0.8/contrib/sendmail/test/t_seteuid.c
===================================================================
--- stable/0.8/contrib/sendmail/test/t_seteuid.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/test/t_seteuid.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -26,7 +26,7 @@
#include <stdio.h>
#ifndef lint
-static char id[] = "@(#)$Id: t_seteuid.c,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $";
+static char id[] = "@(#)$Id: t_seteuid.c,v 8.9 2013-11-22 20:52:01 ca Exp $";
#endif /* ! lint */
#ifdef __hpux
Modified: stable/0.8/contrib/sendmail/test/t_setgid.c
===================================================================
--- stable/0.8/contrib/sendmail/test/t_setgid.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/test/t_setgid.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -22,7 +22,7 @@
#include <stdio.h>
#ifndef lint
-static char id[] = "@(#)$Id: t_setgid.c,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $";
+static char id[] = "@(#)$Id: t_setgid.c,v 1.7 2013-11-22 20:52:01 ca Exp $";
#endif /* ! lint */
static void
Modified: stable/0.8/contrib/sendmail/test/t_setreuid.c
===================================================================
--- stable/0.8/contrib/sendmail/test/t_setreuid.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/test/t_setreuid.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -23,7 +23,7 @@
#include <stdio.h>
#ifndef lint
-static char id[] = "@(#)$Id: t_setreuid.c,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $";
+static char id[] = "@(#)$Id: t_setreuid.c,v 8.10 2013-11-22 20:52:01 ca Exp $";
#endif /* ! lint */
#ifdef __hpux
Modified: stable/0.8/contrib/sendmail/test/t_setuid.c
===================================================================
--- stable/0.8/contrib/sendmail/test/t_setuid.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/test/t_setuid.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -25,7 +25,7 @@
#include <stdio.h>
#ifndef lint
-static char id[] = "@(#)$Id: t_setuid.c,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $";
+static char id[] = "@(#)$Id: t_setuid.c,v 8.8 2013-11-22 20:52:01 ca Exp $";
#endif /* ! lint */
static void
Modified: stable/0.8/contrib/sendmail/test/t_snprintf.c
===================================================================
--- stable/0.8/contrib/sendmail/test/t_snprintf.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/test/t_snprintf.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -12,7 +12,7 @@
#include <sysexits.h>
#ifndef lint
-static char id[] = "@(#)$Id: t_snprintf.c,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $";
+static char id[] = "@(#)$Id: t_snprintf.c,v 8.5 2013-11-22 20:52:01 ca Exp $";
#endif /* ! lint */
#define TEST_STRING "1234567890"
Modified: stable/0.8/contrib/sendmail/vacation/Makefile
===================================================================
--- stable/0.8/contrib/sendmail/vacation/Makefile 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/vacation/Makefile 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $
+# $Id: Makefile,v 8.5 1999-09-23 22:36:45 ca Exp $
SHELL= /bin/sh
BUILD= ./Build
Modified: stable/0.8/contrib/sendmail/vacation/Makefile.m4
===================================================================
--- stable/0.8/contrib/sendmail/vacation/Makefile.m4 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/vacation/Makefile.m4 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-dnl $Id: Makefile.m4,v 1.1.1.3 2007-11-23 22:10:30 laffer1 Exp $
+dnl $Id: Makefile.m4,v 8.26 2006-06-28 21:08:05 ca Exp $
include(confBUILDTOOLSDIR`/M4/switch.m4')
define(`confREQUIRE_LIBSM', `true')
Copied: stable/0.8/contrib/sendmail/vacation/vacation.0 (from rev 9097, trunk/contrib/sendmail/vacation/vacation.0)
===================================================================
--- stable/0.8/contrib/sendmail/vacation/vacation.0 (rev 0)
+++ stable/0.8/contrib/sendmail/vacation/vacation.0 2016-10-01 17:46:48 UTC (rev 9102)
@@ -0,0 +1,149 @@
+VACATION(1) VACATION(1)
+
+
+
+NNAAMMEE
+ vacation - E-mail auto-responder
+
+SSYYNNOOPPSSIISS
+ vvaaccaattiioonn [--aa _a_l_i_a_s] [--CC _c_f_f_i_l_e] [--dd] [--ff _d_a_t_a_b_a_s_e] [--ii] [--II] [--jj] [--ll]
+ [--mm _m_e_s_s_a_g_e] [--RR _r_e_t_u_r_n_a_d_d_r] [--rr _i_n_t_e_r_v_a_l] [--ss _a_d_d_r_e_s_s] [--tt _t_i_m_e] [--UU]
+ [--xx] [--zz] _l_o_g_i_n
+
+DDEESSCCRRIIPPTTIIOONN
+ VVaaccaattiioonn returns a message, _~_/_._v_a_c_a_t_i_o_n_._m_s_g by default, to the sender
+ informing them that you are currently not reading your mail. The mes-
+ sage is only sent to each sender once per reply interval (see --rr
+ below). The intended use is in a _._f_o_r_w_a_r_d file. For example, your
+ _._f_o_r_w_a_r_d file might have:
+
+ \eric, "|/usr/bin/vacation -a allman eric"
+
+ which would send messages to you (assuming your login name was eric)
+ and reply to any messages for ``eric'' or ``allman''.
+
+ Available options:
+
+ --aa _a_l_i_a_s
+ Handle messages for _a_l_i_a_s in the same manner as those received
+ for the user's login name.
+
+ --CC _c_f_p_a_t_h
+ Specify pathname of the sendmail configuration file. This
+ option is ignored if --UU is specified. This option defaults to
+ the standard sendmail configuration file, located at
+ /etc/mail/sendmail.cf on most systems.
+
+ --dd Send error/debug messages to stderr instead of syslog. Other-
+ wise, fatal errors, such as calling vvaaccaattiioonn with incorrect
+ arguments, or with non-existent _l_o_g_i_ns, are logged in the system
+ log file, using syslog(8). This should only be used on the com-
+ mand line, not in your _._f_o_r_w_a_r_d file.
+
+ --ff _f_i_l_e_n_a_m_e
+ Use _f_i_l_e_n_a_m_e as name of the database instead of _~_/_._v_a_c_a_t_i_o_n_._d_b
+ or _~_/_._v_a_c_a_t_i_o_n_._{_d_i_r_,_p_a_g_}. Unless the _f_i_l_e_n_a_m_e starts with / it
+ is relative to ~.
+
+ --ii Initialize the vacation database files. It should be used
+ before you modify your _._f_o_r_w_a_r_d file. This should only be used
+ on the command line, not in your _._f_o_r_w_a_r_d file.
+
+ --II Same as --ii (for backwards compatibility). This should only be
+ used on the command line, not in your _._f_o_r_w_a_r_d file.
+
+ --jj Respond to the message regardless of whether the login is listed
+ as a recipient for the message. Do not use this flag unless you
+ are sure of the consequences. For example, this will cause to
+ reply to mailing list messages which may result in removing you
+ from the list.
+
+ --ll List the content of the vacation database file including the
+ address and the associated time of the last auto-response to
+ that address. This should only be used on the command line, not
+ in your _._f_o_r_w_a_r_d file.
+
+ --mm _f_i_l_e_n_a_m_e
+ Use _f_i_l_e_n_a_m_e as name of the file containing the message to send
+ instead of _~_/_._v_a_c_a_t_i_o_n_._m_s_g. Unless the _f_i_l_e_n_a_m_e starts with /
+ it is relative to ~.
+
+ --RR _r_e_t_u_r_n_a_d_d_r
+ Set the reply envelope sender address
+
+ --rr _i_n_t_e_r_v_a_l
+ Set the reply interval to _i_n_t_e_r_v_a_l days. The default is one
+ week. An interval of ``0'' or ``infinite'' (actually, any non-
+ numeric character) will never send more than one reply. The --rr
+ option should only be used when the vacation database is ini-
+ tialized (see --ii above).
+
+ --ss _a_d_d_r_e_s_s
+ Use _a_d_d_r_e_s_s instead of the incoming message sender address on
+ the _F_r_o_m line as the recipient for the vacation message.
+
+ --tt _t_i_m_e
+ Ignored, available only for compatibility with Sun's vacation
+ program.
+
+ --UU Do not attempt to lookup _l_o_g_i_n in the password file. The -f and
+ -m options must be used to specify the database and message file
+ since there is no home directory for the default settings for
+ these options.
+
+ --xx Reads an exclusion list from stdin (one address per line).
+ Mails coming from an address in this exclusion list won't get a
+ reply by vvaaccaattiioonn. It is possible to exclude complete domains
+ by specifying ``@domain'' as element of the exclusion list.
+ This should only be used on the command line, not in your _._f_o_r_-
+ _w_a_r_d file.
+
+ --zz Set the sender of the vacation message to ``<>'' instead of the
+ user. This probably violates the RFCs since vacation messages
+ are not required by a standards-track RFC to have a null
+ reverse-path.
+
+ VVaaccaattiioonn reads the first line from the standard input for a UNIX
+ ``From'' line to determine the sender. Sendmail(8) includes this
+ ``From'' line automatically.
+
+ No message will be sent unless _l_o_g_i_n (or an _a_l_i_a_s supplied using the --aa
+ option) is part of either the ``To:'' or ``Cc:'' headers of the mail.
+ No messages from ``???-REQUEST'', ``???-RELAY'', ``???-OWNER'',
+ ``OWNER-???'', ``Postmaster'', ``UUCP'', ``MAILER'', or ``MAILER-DAE-
+ MON'' will be replied to (where these strings are case insensitive) nor
+ is a notification sent if a ``Precedence: bulk'' or ``Precedence:
+ junk'' line is included in the mail headers. The people who have sent
+ you messages are maintained as a db(3) or dbm(3) database in the file
+ _._v_a_c_a_t_i_o_n_._d_b or _._v_a_c_a_t_i_o_n_._{_d_i_r_,_p_a_g_} in your home directory.
+
+ VVaaccaattiioonn expects a file _._v_a_c_a_t_i_o_n_._m_s_g, in your home directory, contain-
+ ing a message to be sent back to each sender. It should be an entire
+ message (including headers). For example, it might contain:
+
+ From: eric at CS.Berkeley.EDU (Eric Allman)
+ Subject: I am on vacation
+ Delivered-By-The-Graces-Of: The Vacation program
+ Precedence: bulk
+
+ I am on vacation until July 22. If you have something urgent,
+ please contact Keith Bostic <bostic at CS.Berkeley.EDU>.
+ --eric
+
+FFIILLEESS
+ ~/.vacation.db default database file for db(3)
+
+ ~/.vacation.{dir,pag}
+ default database file for dbm(3)
+
+ ~/.vacation.msg default message to send
+
+SSEEEE AALLSSOO
+ sendmail(8), syslog(8)
+
+HHIISSTTOORRYY
+ The vvaaccaattiioonn command appeared in 4.3BSD.
+
+
+
+ $Date: 2013-11-22 20:52:02 $ VACATION(1)
Modified: stable/0.8/contrib/sendmail/vacation/vacation.1
===================================================================
--- stable/0.8/contrib/sendmail/vacation/vacation.1 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/vacation/vacation.1 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1999-2002 Sendmail, Inc. and its suppliers.
+.\" Copyright (c) 1999-2002 Proofpoint, Inc. and its suppliers.
.\" All rights reserved.
.\" Copyright (c) 1985, 1987, 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -9,9 +9,9 @@
.\" the sendmail distribution.
.\"
.\"
-.\" $Id: vacation.1,v 1.1.1.2 2006-02-25 02:34:00 laffer1 Exp $
+.\" $Id: vacation.1,v 8.35 2013-11-22 20:52:02 ca Exp $
.\"
-.TH VACATION 1 "$Date: 2006-02-25 02:34:00 $"
+.TH VACATION 1 "$Date: 2013-11-22 20:52:02 $"
.SH NAME
vacation
\- E-mail auto-responder
Modified: stable/0.8/contrib/sendmail/vacation/vacation.c
===================================================================
--- stable/0.8/contrib/sendmail/vacation/vacation.c 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/contrib/sendmail/vacation/vacation.c 2016-10-01 17:46:48 UTC (rev 9102)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2002, 2009 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2002, 2009 Proofpoint, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1987, 1993
* The Regents of the University of California. All rights reserved.
@@ -14,13 +14,13 @@
#include <sm/gen.h>
SM_IDSTR(copyright,
-"@(#) Copyright (c) 1999-2002, 2009 Sendmail, Inc. and its suppliers.\n\
+"@(#) Copyright (c) 1999-2002, 2009 Proofpoint, Inc. and its suppliers.\n\
All rights reserved.\n\
Copyright (c) 1983, 1987, 1993\n\
The Regents of the University of California. All rights reserved.\n\
Copyright (c) 1983 Eric P. Allman. All rights reserved.\n")
-SM_IDSTR(id, "@(#)$Id: vacation.c,v 1.1.1.5 2013-08-14 22:35:47 laffer1 Exp $")
+SM_IDSTR(id, "@(#)$Id: vacation.c,v 8.148 2013-11-22 20:52:02 ca Exp $")
#include <ctype.h>
Modified: stable/0.8/etc/sendmail/midnightbsd.mc
===================================================================
--- stable/0.8/etc/sendmail/midnightbsd.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/etc/sendmail/midnightbsd.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -34,7 +34,7 @@
#
#
-# This is a generic configuration file for MidnightBSD 0.7 and later systems.
+# This is a generic configuration file for MidnightBSD 0.8 and later systems.
# If you want to customize it, copy it to a name appropriate for your
# environment and do the modifications there.
#
Modified: stable/0.8/etc/sendmail/midnightbsd.submit.mc
===================================================================
--- stable/0.8/etc/sendmail/midnightbsd.submit.mc 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/etc/sendmail/midnightbsd.submit.mc 2016-10-01 17:46:48 UTC (rev 9102)
@@ -13,7 +13,6 @@
# This is the MidnightBSD configuration for a set-group-ID sm-msp sendmail
# that acts as a initial mail submission program.
#
-#
divert(0)dnl
VERSIONID(`$MidnightBSD$')
Modified: stable/0.8/sys/conf/newvers.sh
===================================================================
--- stable/0.8/sys/conf/newvers.sh 2016-10-01 12:23:10 UTC (rev 9101)
+++ stable/0.8/sys/conf/newvers.sh 2016-10-01 17:46:48 UTC (rev 9102)
@@ -32,7 +32,7 @@
# $MidnightBSD$
TYPE="MidnightBSD"
-REVISION="0.8.1"
+REVISION="0.8.2"
RELEASE="${REVISION}"
VERSION="${TYPE} ${RELEASE}"
SYSDIR=$(/usr/bin/dirname $0)/..
More information about the Midnightbsd-cvs
mailing list