From 233440fc4d6ef6d047a62c2f3da67ec94b7e78c8 Mon Sep 17 00:00:00 2001 From: gshapiro Date: Sun, 2 Feb 2014 00:04:23 +0000 Subject: [PATCH] MFC: Merge sendmail 8.14.8 git-svn-id: svn://svn.freebsd.org/base/stable/8@261377 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- contrib/sendmail/LICENSE | 16 +- contrib/sendmail/PGPKEYS | 180 +++++++++++++++++- contrib/sendmail/README | 6 +- contrib/sendmail/RELEASE_NOTES | 54 +++++- contrib/sendmail/cf/README | 7 +- contrib/sendmail/cf/cf/chez.cs.mc | 4 +- contrib/sendmail/cf/cf/clientproto.mc | 4 +- contrib/sendmail/cf/cf/cs-hpux10.mc | 4 +- contrib/sendmail/cf/cf/cs-hpux9.mc | 4 +- contrib/sendmail/cf/cf/cs-osf1.mc | 4 +- contrib/sendmail/cf/cf/cs-solaris2.mc | 4 +- contrib/sendmail/cf/cf/cs-sunos4.1.mc | 4 +- contrib/sendmail/cf/cf/cs-ultrix4.mc | 4 +- contrib/sendmail/cf/cf/generic-bsd4.4.mc | 4 +- contrib/sendmail/cf/cf/generic-hpux10.mc | 4 +- contrib/sendmail/cf/cf/generic-hpux9.mc | 4 +- contrib/sendmail/cf/cf/generic-linux.mc | 4 +- contrib/sendmail/cf/cf/generic-mpeix.mc | 4 +- contrib/sendmail/cf/cf/generic-nextstep3.3.mc | 4 +- contrib/sendmail/cf/cf/generic-osf1.mc | 4 +- contrib/sendmail/cf/cf/generic-solaris.mc | 4 +- contrib/sendmail/cf/cf/generic-sunos4.1.mc | 4 +- contrib/sendmail/cf/cf/generic-ultrix4.mc | 4 +- contrib/sendmail/cf/cf/huginn.cs.mc | 4 +- contrib/sendmail/cf/cf/knecht.mc | 4 +- contrib/sendmail/cf/cf/mail.cs.mc | 4 +- contrib/sendmail/cf/cf/mail.eecs.mc | 4 +- contrib/sendmail/cf/cf/mailspool.cs.mc | 4 +- contrib/sendmail/cf/cf/python.cs.mc | 4 +- contrib/sendmail/cf/cf/s2k-osf1.mc | 4 +- contrib/sendmail/cf/cf/s2k-ultrix4.mc | 4 +- contrib/sendmail/cf/cf/submit.cf | 28 +-- contrib/sendmail/cf/cf/submit.mc | 4 +- contrib/sendmail/cf/cf/tcpproto.mc | 4 +- contrib/sendmail/cf/cf/ucbarpa.mc | 4 +- contrib/sendmail/cf/cf/ucbvax.mc | 4 +- contrib/sendmail/cf/cf/uucpproto.mc | 4 +- contrib/sendmail/cf/cf/vangogh.cs.mc | 4 +- contrib/sendmail/cf/domain/Berkeley.EDU.m4 | 4 +- contrib/sendmail/cf/domain/CS.Berkeley.EDU.m4 | 4 +- .../sendmail/cf/domain/EECS.Berkeley.EDU.m4 | 4 +- .../sendmail/cf/domain/S2K.Berkeley.EDU.m4 | 4 +- contrib/sendmail/cf/domain/berkeley-only.m4 | 4 +- contrib/sendmail/cf/domain/generic.m4 | 4 +- .../cf/feature/accept_unqualified_senders.m4 | 4 +- .../cf/feature/accept_unresolvable_domains.m4 | 4 +- contrib/sendmail/cf/feature/access_db.m4 | 4 +- contrib/sendmail/cf/feature/allmasquerade.m4 | 4 +- .../sendmail/cf/feature/always_add_domain.m4 | 4 +- contrib/sendmail/cf/feature/authinfo.m4 | 4 +- contrib/sendmail/cf/feature/badmx.m4 | 4 +- .../sendmail/cf/feature/bestmx_is_local.m4 | 4 +- contrib/sendmail/cf/feature/bitdomain.m4 | 4 +- .../cf/feature/blacklist_recipients.m4 | 4 +- contrib/sendmail/cf/feature/block_bad_helo.m4 | 4 +- contrib/sendmail/cf/feature/compat_check.m4 | 4 +- contrib/sendmail/cf/feature/conncontrol.m4 | 4 +- contrib/sendmail/cf/feature/delay_checks.m4 | 4 +- contrib/sendmail/cf/feature/dnsbl.m4 | 4 +- contrib/sendmail/cf/feature/domaintable.m4 | 4 +- contrib/sendmail/cf/feature/enhdnsbl.m4 | 4 +- .../cf/feature/generics_entire_domain.m4 | 4 +- contrib/sendmail/cf/feature/genericstable.m4 | 4 +- contrib/sendmail/cf/feature/greet_pause.m4 | 4 +- contrib/sendmail/cf/feature/ldap_routing.m4 | 4 +- .../sendmail/cf/feature/limited_masquerade.m4 | 4 +- contrib/sendmail/cf/feature/local_lmtp.m4 | 4 +- .../cf/feature/local_no_masquerade.m4 | 4 +- contrib/sendmail/cf/feature/local_procmail.m4 | 4 +- .../sendmail/cf/feature/lookupdotdomain.m4 | 4 +- .../sendmail/cf/feature/loose_relay_check.m4 | 4 +- contrib/sendmail/cf/feature/mailertable.m4 | 4 +- .../cf/feature/masquerade_entire_domain.m4 | 4 +- .../cf/feature/masquerade_envelope.m4 | 4 +- contrib/sendmail/cf/feature/msp.m4 | 4 +- contrib/sendmail/cf/feature/mtamark.m4 | 4 +- contrib/sendmail/cf/feature/no_default_msa.m4 | 4 +- contrib/sendmail/cf/feature/nocanonify.m4 | 4 +- contrib/sendmail/cf/feature/notsticky.m4 | 4 +- contrib/sendmail/cf/feature/nouucp.m4 | 4 +- contrib/sendmail/cf/feature/nullclient.m4 | 4 +- .../cf/feature/preserve_local_plus_detail.m4 | 4 +- .../cf/feature/preserve_luser_host.m4 | 4 +- .../sendmail/cf/feature/promiscuous_relay.m4 | 4 +- contrib/sendmail/cf/feature/queuegroup.m4 | 4 +- contrib/sendmail/cf/feature/ratecontrol.m4 | 4 +- contrib/sendmail/cf/feature/redirect.m4 | 4 +- .../sendmail/cf/feature/relay_based_on_MX.m4 | 4 +- .../cf/feature/relay_entire_domain.m4 | 4 +- .../sendmail/cf/feature/relay_hosts_only.m4 | 4 +- .../sendmail/cf/feature/relay_local_from.m4 | 4 +- .../sendmail/cf/feature/relay_mail_from.m4 | 4 +- contrib/sendmail/cf/feature/require_rdns.m4 | 4 +- contrib/sendmail/cf/feature/smrsh.m4 | 4 +- contrib/sendmail/cf/feature/stickyhost.m4 | 4 +- contrib/sendmail/cf/feature/use_client_ptr.m4 | 4 +- contrib/sendmail/cf/feature/use_ct_file.m4 | 4 +- contrib/sendmail/cf/feature/use_cw_file.m4 | 4 +- contrib/sendmail/cf/feature/uucpdomain.m4 | 4 +- .../cf/feature/virtuser_entire_domain.m4 | 4 +- contrib/sendmail/cf/feature/virtusertable.m4 | 4 +- contrib/sendmail/cf/hack/cssubdomain.m4 | 4 +- contrib/sendmail/cf/m4/cf.m4 | 4 +- contrib/sendmail/cf/m4/cfhead.m4 | 4 +- contrib/sendmail/cf/m4/proto.m4 | 6 +- contrib/sendmail/cf/m4/version.m4 | 6 +- contrib/sendmail/cf/mailer/cyrus.m4 | 4 +- contrib/sendmail/cf/mailer/cyrusv2.m4 | 4 +- contrib/sendmail/cf/mailer/fax.m4 | 4 +- contrib/sendmail/cf/mailer/local.m4 | 4 +- contrib/sendmail/cf/mailer/mail11.m4 | 4 +- contrib/sendmail/cf/mailer/phquery.m4 | 4 +- contrib/sendmail/cf/mailer/pop.m4 | 4 +- contrib/sendmail/cf/mailer/procmail.m4 | 4 +- contrib/sendmail/cf/mailer/qpage.m4 | 4 +- contrib/sendmail/cf/mailer/smtp.m4 | 4 +- contrib/sendmail/cf/mailer/usenet.m4 | 4 +- contrib/sendmail/cf/mailer/uucp.m4 | 4 +- contrib/sendmail/cf/ostype/a-ux.m4 | 4 +- contrib/sendmail/cf/ostype/aix3.m4 | 4 +- contrib/sendmail/cf/ostype/aix4.m4 | 4 +- contrib/sendmail/cf/ostype/aix5.m4 | 4 +- contrib/sendmail/cf/ostype/altos.m4 | 4 +- contrib/sendmail/cf/ostype/amdahl-uts.m4 | 4 +- contrib/sendmail/cf/ostype/bsd4.3.m4 | 4 +- contrib/sendmail/cf/ostype/bsd4.4.m4 | 4 +- contrib/sendmail/cf/ostype/bsdi.m4 | 4 +- contrib/sendmail/cf/ostype/bsdi1.0.m4 | 4 +- contrib/sendmail/cf/ostype/bsdi2.0.m4 | 4 +- contrib/sendmail/cf/ostype/darwin.m4 | 4 +- contrib/sendmail/cf/ostype/dgux.m4 | 4 +- contrib/sendmail/cf/ostype/domainos.m4 | 4 +- contrib/sendmail/cf/ostype/dragonfly.m4 | 4 +- contrib/sendmail/cf/ostype/dynix3.2.m4 | 4 +- contrib/sendmail/cf/ostype/freebsd4.m4 | 4 +- contrib/sendmail/cf/ostype/freebsd5.m4 | 4 +- contrib/sendmail/cf/ostype/freebsd6.m4 | 4 +- contrib/sendmail/cf/ostype/gnu.m4 | 4 +- contrib/sendmail/cf/ostype/hpux10.m4 | 4 +- contrib/sendmail/cf/ostype/hpux11.m4 | 4 +- contrib/sendmail/cf/ostype/hpux9.m4 | 4 +- contrib/sendmail/cf/ostype/irix4.m4 | 4 +- contrib/sendmail/cf/ostype/irix5.m4 | 4 +- contrib/sendmail/cf/ostype/irix6.m4 | 4 +- contrib/sendmail/cf/ostype/isc4.1.m4 | 4 +- contrib/sendmail/cf/ostype/linux.m4 | 4 +- contrib/sendmail/cf/ostype/maxion.m4 | 4 +- contrib/sendmail/cf/ostype/mklinux.m4 | 4 +- contrib/sendmail/cf/ostype/mpeix.m4 | 4 +- contrib/sendmail/cf/ostype/nextstep.m4 | 4 +- contrib/sendmail/cf/ostype/openbsd.m4 | 4 +- contrib/sendmail/cf/ostype/osf1.m4 | 4 +- contrib/sendmail/cf/ostype/powerux.m4 | 4 +- contrib/sendmail/cf/ostype/ptx2.m4 | 4 +- contrib/sendmail/cf/ostype/qnx.m4 | 4 +- contrib/sendmail/cf/ostype/riscos4.5.m4 | 4 +- contrib/sendmail/cf/ostype/sco-uw-2.1.m4 | 4 +- contrib/sendmail/cf/ostype/sco3.2.m4 | 4 +- contrib/sendmail/cf/ostype/sinix.m4 | 4 +- contrib/sendmail/cf/ostype/solaris11.m4 | 4 +- contrib/sendmail/cf/ostype/solaris2.m4 | 4 +- contrib/sendmail/cf/ostype/solaris2.ml.m4 | 4 +- contrib/sendmail/cf/ostype/solaris2.pre5.m4 | 4 +- contrib/sendmail/cf/ostype/solaris8.m4 | 4 +- contrib/sendmail/cf/ostype/sunos3.5.m4 | 4 +- contrib/sendmail/cf/ostype/sunos4.1.m4 | 4 +- contrib/sendmail/cf/ostype/svr4.m4 | 4 +- contrib/sendmail/cf/ostype/ultrix4.m4 | 4 +- contrib/sendmail/cf/ostype/unicos.m4 | 4 +- contrib/sendmail/cf/ostype/unicosmk.m4 | 4 +- contrib/sendmail/cf/ostype/unicosmp.m4 | 4 +- contrib/sendmail/cf/ostype/unixware7.m4 | 4 +- contrib/sendmail/cf/ostype/unknown.m4 | 4 +- contrib/sendmail/cf/ostype/uxpds.m4 | 4 +- contrib/sendmail/cf/sendmail.schema | 4 +- contrib/sendmail/cf/sh/makeinfo.sh | 4 +- contrib/sendmail/contrib/dnsblaccess.m4 | 4 +- contrib/sendmail/contrib/link_hash.sh | 4 +- contrib/sendmail/contrib/qtool.8 | 6 +- contrib/sendmail/contrib/qtool.pl | 4 +- contrib/sendmail/doc/op/op.me | 36 ++-- contrib/sendmail/editmap/editmap.8 | 6 +- contrib/sendmail/editmap/editmap.c | 6 +- contrib/sendmail/include/libmilter/mfapi.h | 4 +- contrib/sendmail/include/libmilter/mfdef.h | 4 +- contrib/sendmail/include/libmilter/milter.h | 4 +- contrib/sendmail/include/libsmdb/smdb.h | 4 +- contrib/sendmail/include/sendmail/mailstats.h | 4 +- contrib/sendmail/include/sendmail/pathnames.h | 4 +- contrib/sendmail/include/sendmail/sendmail.h | 4 +- contrib/sendmail/include/sm/assert.h | 4 +- contrib/sendmail/include/sm/bdb.h | 4 +- contrib/sendmail/include/sm/bitops.h | 4 +- contrib/sendmail/include/sm/cdefs.h | 4 +- contrib/sendmail/include/sm/cf.h | 4 +- contrib/sendmail/include/sm/clock.h | 4 +- contrib/sendmail/include/sm/conf.h | 13 +- contrib/sendmail/include/sm/config.h | 4 +- contrib/sendmail/include/sm/debug.h | 4 +- contrib/sendmail/include/sm/errstring.h | 4 +- contrib/sendmail/include/sm/exc.h | 4 +- contrib/sendmail/include/sm/fdset.h | 4 +- contrib/sendmail/include/sm/gen.h | 4 +- contrib/sendmail/include/sm/heap.h | 4 +- contrib/sendmail/include/sm/io.h | 4 +- contrib/sendmail/include/sm/ldap.h | 4 +- contrib/sendmail/include/sm/limits.h | 4 +- contrib/sendmail/include/sm/mbdb.h | 4 +- contrib/sendmail/include/sm/misc.h | 4 +- contrib/sendmail/include/sm/os/sm_os_aix.h | 4 +- .../sendmail/include/sm/os/sm_os_dragonfly.h | 4 +- .../sendmail/include/sm/os/sm_os_freebsd.h | 4 +- contrib/sendmail/include/sm/os/sm_os_hp.h | 4 +- contrib/sendmail/include/sm/os/sm_os_irix.h | 4 +- contrib/sendmail/include/sm/os/sm_os_linux.h | 4 +- contrib/sendmail/include/sm/os/sm_os_mpeix.h | 4 +- contrib/sendmail/include/sm/os/sm_os_next.h | 4 +- .../sendmail/include/sm/os/sm_os_openbsd.h | 4 +- .../sendmail/include/sm/os/sm_os_openunix.h | 4 +- contrib/sendmail/include/sm/os/sm_os_osf1.h | 4 +- contrib/sendmail/include/sm/os/sm_os_qnx.h | 4 +- contrib/sendmail/include/sm/os/sm_os_sunos.h | 4 +- contrib/sendmail/include/sm/os/sm_os_ultrix.h | 4 +- contrib/sendmail/include/sm/os/sm_os_unicos.h | 4 +- .../sendmail/include/sm/os/sm_os_unicosmk.h | 4 +- .../sendmail/include/sm/os/sm_os_unicosmp.h | 4 +- .../sendmail/include/sm/os/sm_os_unixware.h | 4 +- contrib/sendmail/include/sm/path.h | 4 +- contrib/sendmail/include/sm/rpool.h | 4 +- contrib/sendmail/include/sm/sem.h | 4 +- contrib/sendmail/include/sm/sendmail.h | 2 +- contrib/sendmail/include/sm/setjmp.h | 4 +- contrib/sendmail/include/sm/shm.h | 4 +- contrib/sendmail/include/sm/signal.h | 4 +- contrib/sendmail/include/sm/string.h | 4 +- contrib/sendmail/include/sm/sysexits.h | 4 +- contrib/sendmail/include/sm/test.h | 4 +- contrib/sendmail/include/sm/time.h | 4 +- contrib/sendmail/include/sm/types.h | 4 +- contrib/sendmail/include/sm/varargs.h | 4 +- contrib/sendmail/include/sm/xtrap.h | 4 +- contrib/sendmail/libmilter/Makefile.m4 | 2 +- contrib/sendmail/libmilter/comm.c | 4 +- contrib/sendmail/libmilter/docs/api.html | 4 +- contrib/sendmail/libmilter/docs/design.html | 4 +- contrib/sendmail/libmilter/docs/index.html | 4 +- .../sendmail/libmilter/docs/installation.html | 4 +- contrib/sendmail/libmilter/docs/other.html | 4 +- contrib/sendmail/libmilter/docs/overview.html | 4 +- contrib/sendmail/libmilter/docs/sample.html | 4 +- .../libmilter/docs/smfi_addheader.html | 4 +- .../sendmail/libmilter/docs/smfi_addrcpt.html | 4 +- .../libmilter/docs/smfi_addrcpt_par.html | 4 +- .../sendmail/libmilter/docs/smfi_chgfrom.html | 4 +- .../libmilter/docs/smfi_chgheader.html | 4 +- .../sendmail/libmilter/docs/smfi_delrcpt.html | 4 +- .../sendmail/libmilter/docs/smfi_getpriv.html | 4 +- .../libmilter/docs/smfi_getsymval.html | 4 +- .../libmilter/docs/smfi_insheader.html | 4 +- .../sendmail/libmilter/docs/smfi_main.html | 4 +- .../libmilter/docs/smfi_opensocket.html | 4 +- .../libmilter/docs/smfi_progress.html | 4 +- .../libmilter/docs/smfi_quarantine.html | 4 +- .../libmilter/docs/smfi_register.html | 4 +- .../libmilter/docs/smfi_replacebody.html | 4 +- .../libmilter/docs/smfi_setbacklog.html | 4 +- .../sendmail/libmilter/docs/smfi_setconn.html | 4 +- .../sendmail/libmilter/docs/smfi_setdbg.html | 4 +- .../libmilter/docs/smfi_setmlreply.html | 4 +- .../sendmail/libmilter/docs/smfi_setpriv.html | 4 +- .../libmilter/docs/smfi_setreply.html | 4 +- .../libmilter/docs/smfi_setsymlist.html | 4 +- .../libmilter/docs/smfi_settimeout.html | 4 +- .../sendmail/libmilter/docs/smfi_stop.html | 4 +- .../sendmail/libmilter/docs/smfi_version.html | 4 +- .../sendmail/libmilter/docs/xxfi_abort.html | 4 +- .../sendmail/libmilter/docs/xxfi_body.html | 4 +- .../sendmail/libmilter/docs/xxfi_close.html | 4 +- .../sendmail/libmilter/docs/xxfi_connect.html | 4 +- .../sendmail/libmilter/docs/xxfi_data.html | 4 +- .../sendmail/libmilter/docs/xxfi_envfrom.html | 4 +- .../sendmail/libmilter/docs/xxfi_envrcpt.html | 4 +- contrib/sendmail/libmilter/docs/xxfi_eoh.html | 4 +- contrib/sendmail/libmilter/docs/xxfi_eom.html | 4 +- .../sendmail/libmilter/docs/xxfi_header.html | 4 +- .../sendmail/libmilter/docs/xxfi_helo.html | 4 +- .../libmilter/docs/xxfi_negotiate.html | 4 +- .../sendmail/libmilter/docs/xxfi_unknown.html | 4 +- contrib/sendmail/libmilter/engine.c | 4 +- contrib/sendmail/libmilter/example.c | 4 +- contrib/sendmail/libmilter/handler.c | 4 +- contrib/sendmail/libmilter/libmilter.h | 4 +- contrib/sendmail/libmilter/listener.c | 4 +- contrib/sendmail/libmilter/main.c | 4 +- contrib/sendmail/libmilter/monitor.c | 4 +- contrib/sendmail/libmilter/signal.c | 4 +- contrib/sendmail/libmilter/sm_gethost.c | 27 ++- contrib/sendmail/libmilter/smfi.c | 4 +- contrib/sendmail/libmilter/worker.c | 4 +- contrib/sendmail/libsm/Makefile.m4 | 5 +- contrib/sendmail/libsm/README | 4 +- contrib/sendmail/libsm/assert.c | 4 +- contrib/sendmail/libsm/b-strcmp.c | 4 +- contrib/sendmail/libsm/b-strl.c | 4 +- contrib/sendmail/libsm/cf.c | 4 +- contrib/sendmail/libsm/clock.c | 4 +- contrib/sendmail/libsm/clrerr.c | 4 +- contrib/sendmail/libsm/config.c | 4 +- contrib/sendmail/libsm/debug.c | 4 +- contrib/sendmail/libsm/errstring.c | 4 +- contrib/sendmail/libsm/exc.c | 4 +- contrib/sendmail/libsm/fclose.c | 4 +- contrib/sendmail/libsm/feof.c | 4 +- contrib/sendmail/libsm/ferror.c | 4 +- contrib/sendmail/libsm/fflush.c | 4 +- contrib/sendmail/libsm/fget.c | 4 +- contrib/sendmail/libsm/findfp.c | 4 +- contrib/sendmail/libsm/flags.c | 4 +- contrib/sendmail/libsm/fopen.c | 4 +- contrib/sendmail/libsm/fpos.c | 4 +- contrib/sendmail/libsm/fprintf.c | 4 +- contrib/sendmail/libsm/fpurge.c | 4 +- contrib/sendmail/libsm/fput.c | 4 +- contrib/sendmail/libsm/fread.c | 4 +- contrib/sendmail/libsm/fscanf.c | 4 +- contrib/sendmail/libsm/fseek.c | 4 +- contrib/sendmail/libsm/fvwrite.c | 4 +- contrib/sendmail/libsm/fvwrite.h | 4 +- contrib/sendmail/libsm/fwalk.c | 4 +- contrib/sendmail/libsm/fwrite.c | 4 +- contrib/sendmail/libsm/get.c | 4 +- contrib/sendmail/libsm/glue.h | 4 +- contrib/sendmail/libsm/heap.c | 4 +- contrib/sendmail/libsm/inet6_ntop.c | 58 ++++++ contrib/sendmail/libsm/ldap.c | 4 +- contrib/sendmail/libsm/local.h | 4 +- contrib/sendmail/libsm/makebuf.c | 4 +- contrib/sendmail/libsm/match.c | 4 +- contrib/sendmail/libsm/mbdb.c | 25 +-- contrib/sendmail/libsm/memstat.c | 4 +- contrib/sendmail/libsm/mpeix.c | 4 +- contrib/sendmail/libsm/niprop.c | 4 +- contrib/sendmail/libsm/path.c | 4 +- contrib/sendmail/libsm/put.c | 4 +- contrib/sendmail/libsm/refill.c | 4 +- contrib/sendmail/libsm/rewind.c | 4 +- contrib/sendmail/libsm/rpool.c | 4 +- contrib/sendmail/libsm/sem.c | 4 +- contrib/sendmail/libsm/setvbuf.c | 4 +- contrib/sendmail/libsm/shm.c | 4 +- contrib/sendmail/libsm/signal.c | 4 +- contrib/sendmail/libsm/smstdio.c | 4 +- contrib/sendmail/libsm/snprintf.c | 4 +- contrib/sendmail/libsm/sscanf.c | 4 +- contrib/sendmail/libsm/stdio.c | 4 +- contrib/sendmail/libsm/strcasecmp.c | 4 +- contrib/sendmail/libsm/strdup.c | 4 +- contrib/sendmail/libsm/strerror.c | 4 +- contrib/sendmail/libsm/strexit.c | 4 +- contrib/sendmail/libsm/string.c | 4 +- contrib/sendmail/libsm/stringf.c | 4 +- contrib/sendmail/libsm/strio.c | 4 +- contrib/sendmail/libsm/strl.c | 4 +- contrib/sendmail/libsm/strrevcmp.c | 4 +- contrib/sendmail/libsm/strto.c | 4 +- contrib/sendmail/libsm/syslogio.c | 4 +- contrib/sendmail/libsm/t-cf.c | 4 +- contrib/sendmail/libsm/t-event.c | 4 +- contrib/sendmail/libsm/t-exc.c | 4 +- contrib/sendmail/libsm/t-fget.c | 4 +- contrib/sendmail/libsm/t-float.c | 4 +- contrib/sendmail/libsm/t-fopen.c | 4 +- contrib/sendmail/libsm/t-heap.c | 4 +- contrib/sendmail/libsm/t-inet6_ntop.c | 73 +++++++ contrib/sendmail/libsm/t-match.c | 4 +- contrib/sendmail/libsm/t-memstat.c | 10 +- contrib/sendmail/libsm/t-path.c | 4 +- contrib/sendmail/libsm/t-qic.c | 4 +- contrib/sendmail/libsm/t-rpool.c | 4 +- contrib/sendmail/libsm/t-scanf.c | 4 +- contrib/sendmail/libsm/t-sem.c | 4 +- contrib/sendmail/libsm/t-shm.c | 4 +- contrib/sendmail/libsm/t-smstdio.c | 4 +- contrib/sendmail/libsm/t-string.c | 4 +- contrib/sendmail/libsm/t-strio.c | 4 +- contrib/sendmail/libsm/t-strl.c | 4 +- contrib/sendmail/libsm/t-strrevcmp.c | 4 +- contrib/sendmail/libsm/t-types.c | 4 +- contrib/sendmail/libsm/test.c | 4 +- contrib/sendmail/libsm/ungetc.c | 4 +- contrib/sendmail/libsm/util.c | 4 +- contrib/sendmail/libsm/vasprintf.c | 4 +- contrib/sendmail/libsm/vfprintf.c | 4 +- contrib/sendmail/libsm/vfscanf.c | 4 +- contrib/sendmail/libsm/vprintf.c | 4 +- contrib/sendmail/libsm/vsnprintf.c | 4 +- contrib/sendmail/libsm/wbuf.c | 4 +- contrib/sendmail/libsm/wsetup.c | 4 +- contrib/sendmail/libsm/xtrap.c | 4 +- contrib/sendmail/libsmdb/smdb.c | 4 +- contrib/sendmail/libsmdb/smdb1.c | 4 +- contrib/sendmail/libsmdb/smdb2.c | 6 +- contrib/sendmail/libsmdb/smndbm.c | 9 +- contrib/sendmail/libsmutil/cf.c | 4 +- contrib/sendmail/libsmutil/debug.c | 4 +- contrib/sendmail/libsmutil/err.c | 4 +- contrib/sendmail/libsmutil/lockfile.c | 4 +- contrib/sendmail/libsmutil/safefile.c | 4 +- contrib/sendmail/libsmutil/snprintf.c | 4 +- contrib/sendmail/mail.local/mail.local.8 | 6 +- contrib/sendmail/mail.local/mail.local.c | 6 +- contrib/sendmail/mailstats/mailstats.8 | 6 +- contrib/sendmail/mailstats/mailstats.c | 6 +- contrib/sendmail/makemap/makemap.8 | 6 +- contrib/sendmail/makemap/makemap.c | 106 ++++++----- contrib/sendmail/praliases/praliases.8 | 6 +- contrib/sendmail/praliases/praliases.c | 6 +- contrib/sendmail/rmail/rmail.8 | 6 +- contrib/sendmail/rmail/rmail.c | 6 +- contrib/sendmail/smrsh/smrsh.8 | 6 +- contrib/sendmail/smrsh/smrsh.c | 6 +- contrib/sendmail/src/Makefile.m4 | 2 +- contrib/sendmail/src/README | 8 +- contrib/sendmail/src/SECURITY | 4 +- contrib/sendmail/src/TRACEFLAGS | 4 +- contrib/sendmail/src/TUNING | 4 +- contrib/sendmail/src/alias.c | 4 +- contrib/sendmail/src/aliases.5 | 6 +- contrib/sendmail/src/arpadate.c | 4 +- contrib/sendmail/src/bf.c | 4 +- contrib/sendmail/src/bf.h | 4 +- contrib/sendmail/src/collect.c | 4 +- contrib/sendmail/src/conf.c | 95 +++++++-- contrib/sendmail/src/conf.h | 8 +- contrib/sendmail/src/control.c | 4 +- contrib/sendmail/src/convtime.c | 4 +- contrib/sendmail/src/daemon.c | 12 +- contrib/sendmail/src/daemon.h | 4 +- contrib/sendmail/src/deliver.c | 4 +- contrib/sendmail/src/domain.c | 6 +- contrib/sendmail/src/envelope.c | 4 +- contrib/sendmail/src/err.c | 4 +- contrib/sendmail/src/headers.c | 28 ++- contrib/sendmail/src/helpfile | 4 +- contrib/sendmail/src/macro.c | 4 +- contrib/sendmail/src/mailq.1 | 6 +- contrib/sendmail/src/main.c | 33 +++- contrib/sendmail/src/map.c | 85 ++++++++- contrib/sendmail/src/map.h | 4 +- contrib/sendmail/src/mci.c | 4 +- contrib/sendmail/src/milter.c | 4 +- contrib/sendmail/src/mime.c | 4 +- contrib/sendmail/src/newaliases.1 | 6 +- contrib/sendmail/src/parseaddr.c | 4 +- contrib/sendmail/src/queue.c | 6 +- contrib/sendmail/src/ratectrl.c | 4 +- contrib/sendmail/src/readcf.c | 27 ++- contrib/sendmail/src/recipient.c | 4 +- contrib/sendmail/src/sasl.c | 4 +- contrib/sendmail/src/savemail.c | 4 +- contrib/sendmail/src/sendmail.8 | 6 +- contrib/sendmail/src/sendmail.h | 7 +- contrib/sendmail/src/sfsasl.c | 4 +- contrib/sendmail/src/sfsasl.h | 4 +- contrib/sendmail/src/shmticklib.c | 4 +- contrib/sendmail/src/sm_resolve.c | 4 +- contrib/sendmail/src/sm_resolve.h | 4 +- contrib/sendmail/src/srvrsmtp.c | 4 +- contrib/sendmail/src/stab.c | 4 +- contrib/sendmail/src/stats.c | 4 +- contrib/sendmail/src/statusd_shm.h | 4 +- contrib/sendmail/src/sysexits.c | 4 +- contrib/sendmail/src/timers.c | 4 +- contrib/sendmail/src/timers.h | 4 +- contrib/sendmail/src/tls.c | 43 ++++- contrib/sendmail/src/trace.c | 4 +- contrib/sendmail/src/udb.c | 6 +- contrib/sendmail/src/usersmtp.c | 4 +- contrib/sendmail/src/util.c | 4 +- contrib/sendmail/src/version.c | 6 +- contrib/sendmail/test/README | 4 +- contrib/sendmail/test/t_dropgid.c | 4 +- contrib/sendmail/test/t_exclopen.c | 4 +- contrib/sendmail/test/t_pathconf.c | 4 +- contrib/sendmail/test/t_seteuid.c | 4 +- contrib/sendmail/test/t_setgid.c | 4 +- contrib/sendmail/test/t_setreuid.c | 4 +- contrib/sendmail/test/t_setuid.c | 4 +- contrib/sendmail/test/t_snprintf.c | 4 +- contrib/sendmail/vacation/vacation.1 | 6 +- contrib/sendmail/vacation/vacation.c | 6 +- 491 files changed, 1781 insertions(+), 1126 deletions(-) create mode 100644 contrib/sendmail/libsm/inet6_ntop.c create mode 100644 contrib/sendmail/libsm/t-inet6_ntop.c diff --git a/contrib/sendmail/LICENSE b/contrib/sendmail/LICENSE index 21e83e57f..62f53f761 100644 --- a/contrib/sendmail/LICENSE +++ b/contrib/sendmail/LICENSE @@ -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@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@proofpoint.com. License Terms: @@ -35,12 +35,12 @@ each of the following conditions is met: 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-2013 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 @@ each of the following conditions is met: (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: 8.18 $, Last updated $Date: 2012/05/15 21:49:03 $, Document 139848.1 +$Revision: 8.22 $, Last updated $Date: 2013/11/23 04:37:36 $, Document 139848.1 diff --git a/contrib/sendmail/PGPKEYS b/contrib/sendmail/PGPKEYS index f56599285..e24ea3e35 100644 --- a/contrib/sendmail/PGPKEYS +++ b/contrib/sendmail/PGPKEYS @@ -141,6 +141,184 @@ gpExpdV7qPrw9k01j5rod5PjZlG8zV0= =SR28 -----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 + +-----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 @@ -2435,4 +2613,4 @@ DnF3FZZEzV7oqPwC2jzv/1dD6GFhtgy0cnyoPGUJCyc= =nES8 -----END PGP PUBLIC KEY BLOCK----- -$Revision: 8.43 $, Last updated $Date: 2013/01/18 17:40:21 $ +$Revision: 8.46 $, Last updated $Date: 2014/01/18 00:20:24 $ diff --git a/contrib/sendmail/README b/contrib/sendmail/README index 8175b1a87..8ff804bf2 100644 --- a/contrib/sendmail/README +++ b/contrib/sendmail/README @@ -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@support.sendmail.org where YYYY is the current year, e.g., 2005. @@ -37,7 +37,7 @@ the latest updates. 4. Read cf/README. -Sendmail is a trademark of Sendmail, Inc. +Sendmail is a trademark of Proofpoint, Inc. US Patent Numbers 6865671, 6986037. +-----------------------+ @@ -465,4 +465,4 @@ sendmail Source for the sendmail program itself. test Some test scripts (currently only for compilation aids). vacation Source for the vacation program. NOT PART OF SENDMAIL! -$Revision: 8.95 $, Last updated $Date: 2009/04/10 17:49:18 $ +$Revision: 8.96 $, Last updated $Date: 2013/11/22 20:51:01 $ diff --git a/contrib/sendmail/RELEASE_NOTES b/contrib/sendmail/RELEASE_NOTES index be030f9fe..77b70580b 100644 --- a/contrib/sendmail/RELEASE_NOTES +++ b/contrib/sendmail/RELEASE_NOTES @@ -1,11 +1,58 @@ SENDMAIL RELEASE NOTES - $Id: RELEASE_NOTES,v 8.2024 2013/04/19 15:01:58 ca Exp $ + $Id: RELEASE_NOTES,v 8.2043 2014/01/23 20:27:19 ca Exp $ This listing shows the version of the sendmail binary, the version of the sendmail configuration files, the date of release, and a summary of the changes in that release. +8.14.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 +127,12 @@ summary of the changes in that release. 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 diff --git a/contrib/sendmail/cf/README b/contrib/sendmail/cf/README index 6d34ac6ad..dbff3de1a 100644 --- a/contrib/sendmail/cf/README +++ b/contrib/sendmail/cf/README @@ -77,7 +77,7 @@ Let's examine a typical .mc file: 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 @@ -1402,6 +1402,9 @@ preserve_local_plus_detail 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 @@ -4701,4 +4704,4 @@ M4 DIVERSIONS 8 DNS based blacklists 9 special local rulesets (1 and 2) -$Revision: 8.728 $, Last updated $Date: 2012/09/07 16:29:13 $ +$Revision: 8.730 $, Last updated $Date: 2014/01/16 15:55:51 $ diff --git a/contrib/sendmail/cf/cf/chez.cs.mc b/contrib/sendmail/cf/cf/chez.cs.mc index bb335a490..9eeb3f622 100644 --- a/contrib/sendmail/cf/cf/chez.cs.mc +++ b/contrib/sendmail/cf/cf/chez.cs.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: chez.cs.mc,v 8.14 1999/02/07 07:25:59 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/clientproto.mc b/contrib/sendmail/cf/cf/clientproto.mc index ecdbddf2a..7aab2e4f5 100644 --- a/contrib/sendmail/cf/cf/clientproto.mc +++ b/contrib/sendmail/cf/cf/clientproto.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: clientproto.mc,v 8.16 2000/03/21 21:05:26 ca Exp $') +VERSIONID(`$Id: clientproto.mc,v 8.17 2013/11/22 20:51:08 ca Exp $') OSTYPE(unknown) FEATURE(nullclient, mailhost.$m) diff --git a/contrib/sendmail/cf/cf/cs-hpux10.mc b/contrib/sendmail/cf/cf/cs-hpux10.mc index f384b5f7a..5c512323e 100644 --- a/contrib/sendmail/cf/cf/cs-hpux10.mc +++ b/contrib/sendmail/cf/cf/cs-hpux10.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: cs-hpux10.mc,v 8.13 1999/02/07 07:26:00 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/cs-hpux9.mc b/contrib/sendmail/cf/cf/cs-hpux9.mc index 664377e5e..806901fc6 100644 --- a/contrib/sendmail/cf/cf/cs-hpux9.mc +++ b/contrib/sendmail/cf/cf/cs-hpux9.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: cs-hpux9.mc,v 8.14 1999/02/07 07:26:00 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/cs-osf1.mc b/contrib/sendmail/cf/cf/cs-osf1.mc index 09d6e4916..f5c344698 100644 --- a/contrib/sendmail/cf/cf/cs-osf1.mc +++ b/contrib/sendmail/cf/cf/cs-osf1.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: cs-osf1.mc,v 8.13 1999/02/07 07:26:00 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/cs-solaris2.mc b/contrib/sendmail/cf/cf/cs-solaris2.mc index c802b50f8..624180984 100644 --- a/contrib/sendmail/cf/cf/cs-solaris2.mc +++ b/contrib/sendmail/cf/cf/cs-solaris2.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: cs-solaris2.mc,v 8.12 1999/02/07 07:26:00 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/cs-sunos4.1.mc b/contrib/sendmail/cf/cf/cs-sunos4.1.mc index 6263e118e..92798a081 100644 --- a/contrib/sendmail/cf/cf/cs-sunos4.1.mc +++ b/contrib/sendmail/cf/cf/cs-sunos4.1.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: cs-sunos4.1.mc,v 8.13 1999/02/07 07:26:01 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/cs-ultrix4.mc b/contrib/sendmail/cf/cf/cs-ultrix4.mc index 7669823bf..ababfd797 100644 --- a/contrib/sendmail/cf/cf/cs-ultrix4.mc +++ b/contrib/sendmail/cf/cf/cs-ultrix4.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: cs-ultrix4.mc,v 8.13 1999/02/07 07:26:02 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/generic-bsd4.4.mc b/contrib/sendmail/cf/cf/generic-bsd4.4.mc index 18ea8b3b8..dd2dd3a9c 100644 --- a/contrib/sendmail/cf/cf/generic-bsd4.4.mc +++ b/contrib/sendmail/cf/cf/generic-bsd4.4.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: generic-bsd4.4.mc,v 8.10 1999/02/07 07:26:02 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/generic-hpux10.mc b/contrib/sendmail/cf/cf/generic-hpux10.mc index deed5f14b..1ddd01e92 100644 --- a/contrib/sendmail/cf/cf/generic-hpux10.mc +++ b/contrib/sendmail/cf/cf/generic-hpux10.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: generic-hpux10.mc,v 8.13 2001/05/29 17:29:52 ca 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 diff --git a/contrib/sendmail/cf/cf/generic-hpux9.mc b/contrib/sendmail/cf/cf/generic-hpux9.mc index 739207c71..29d41ff6f 100644 --- a/contrib/sendmail/cf/cf/generic-hpux9.mc +++ b/contrib/sendmail/cf/cf/generic-hpux9.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: generic-hpux9.mc,v 8.11 1999/02/07 07:26:02 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/generic-linux.mc b/contrib/sendmail/cf/cf/generic-linux.mc index f86e26308..9e7a36782 100644 --- a/contrib/sendmail/cf/cf/generic-linux.mc +++ b/contrib/sendmail/cf/cf/generic-linux.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: generic-linux.mc,v 8.1 1999/09/24 22:48:05 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/generic-mpeix.mc b/contrib/sendmail/cf/cf/generic-mpeix.mc index fa5c57456..ec1d07bb4 100644 --- a/contrib/sendmail/cf/cf/generic-mpeix.mc +++ b/contrib/sendmail/cf/cf/generic-mpeix.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: generic-mpeix.mc,v 8.1 2001/12/13 23:56:37 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/generic-nextstep3.3.mc b/contrib/sendmail/cf/cf/generic-nextstep3.3.mc index 14b46d387..6b8ad2fef 100644 --- a/contrib/sendmail/cf/cf/generic-nextstep3.3.mc +++ b/contrib/sendmail/cf/cf/generic-nextstep3.3.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: generic-nextstep3.3.mc,v 8.10 1999/02/07 07:26:02 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/generic-osf1.mc b/contrib/sendmail/cf/cf/generic-osf1.mc index 9cd4e77b6..1026849fa 100644 --- a/contrib/sendmail/cf/cf/generic-osf1.mc +++ b/contrib/sendmail/cf/cf/generic-osf1.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: generic-osf1.mc,v 8.11 1999/02/07 07:26:02 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/generic-solaris.mc b/contrib/sendmail/cf/cf/generic-solaris.mc index 5f82340e9..ed3c27104 100644 --- a/contrib/sendmail/cf/cf/generic-solaris.mc +++ b/contrib/sendmail/cf/cf/generic-solaris.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: generic-solaris.mc,v 8.13 2001/06/27 21:46:30 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/generic-sunos4.1.mc b/contrib/sendmail/cf/cf/generic-sunos4.1.mc index a27d099e0..4dcbd2f23 100644 --- a/contrib/sendmail/cf/cf/generic-sunos4.1.mc +++ b/contrib/sendmail/cf/cf/generic-sunos4.1.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: generic-sunos4.1.mc,v 8.11 1999/02/07 07:26:03 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/generic-ultrix4.mc b/contrib/sendmail/cf/cf/generic-ultrix4.mc index 913edb586..d886e7816 100644 --- a/contrib/sendmail/cf/cf/generic-ultrix4.mc +++ b/contrib/sendmail/cf/cf/generic-ultrix4.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: generic-ultrix4.mc,v 8.11 1999/02/07 07:26:03 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/huginn.cs.mc b/contrib/sendmail/cf/cf/huginn.cs.mc index 117a236af..ddca3a419 100644 --- a/contrib/sendmail/cf/cf/huginn.cs.mc +++ b/contrib/sendmail/cf/cf/huginn.cs.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: huginn.cs.mc,v 8.15 1999/02/07 07:26:03 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/knecht.mc b/contrib/sendmail/cf/cf/knecht.mc index 29d29113d..f28424579 100644 --- a/contrib/sendmail/cf/cf/knecht.mc +++ b/contrib/sendmail/cf/cf/knecht.mc @@ -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(-1) # divert(0) -VERSIONID(`$Id: knecht.mc,v 8.62 2006/09/27 19:48:59 eric Exp $') +VERSIONID(`$Id: knecht.mc,v 8.63 2013/11/22 20:51:08 ca Exp $') OSTYPE(bsd4.4) DOMAIN(generic) diff --git a/contrib/sendmail/cf/cf/mail.cs.mc b/contrib/sendmail/cf/cf/mail.cs.mc index 6bd778258..2d501d1e4 100644 --- a/contrib/sendmail/cf/cf/mail.cs.mc +++ b/contrib/sendmail/cf/cf/mail.cs.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: mail.cs.mc,v 8.18 1999/02/07 07:26:04 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/mail.eecs.mc b/contrib/sendmail/cf/cf/mail.eecs.mc index bf7d4081c..1cbc6867b 100644 --- a/contrib/sendmail/cf/cf/mail.eecs.mc +++ b/contrib/sendmail/cf/cf/mail.eecs.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: mail.eecs.mc,v 8.18 1999/02/07 07:26:04 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/mailspool.cs.mc b/contrib/sendmail/cf/cf/mailspool.cs.mc index 0414e4c3f..dcbde566f 100644 --- a/contrib/sendmail/cf/cf/mailspool.cs.mc +++ b/contrib/sendmail/cf/cf/mailspool.cs.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: mailspool.cs.mc,v 8.12 1999/02/07 07:26:04 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/python.cs.mc b/contrib/sendmail/cf/cf/python.cs.mc index c3b3e0da0..59c5c66c1 100644 --- a/contrib/sendmail/cf/cf/python.cs.mc +++ b/contrib/sendmail/cf/cf/python.cs.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: python.cs.mc,v 8.12 1999/02/07 07:26:04 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/s2k-osf1.mc b/contrib/sendmail/cf/cf/s2k-osf1.mc index 6ec08feae..91101417b 100644 --- a/contrib/sendmail/cf/cf/s2k-osf1.mc +++ b/contrib/sendmail/cf/cf/s2k-osf1.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: s2k-osf1.mc,v 8.13 1999/02/07 07:26:04 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/s2k-ultrix4.mc b/contrib/sendmail/cf/cf/s2k-ultrix4.mc index 4bf493979..5cd8c7fa4 100644 --- a/contrib/sendmail/cf/cf/s2k-ultrix4.mc +++ b/contrib/sendmail/cf/cf/s2k-ultrix4.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: s2k-ultrix4.mc,v 8.13 1999/02/07 07:26:04 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/submit.cf b/contrib/sendmail/cf/cf/submit.cf index fc1ff3c43..46fd8ff23 100644 --- a/contrib/sendmail/cf/cf/submit.cf +++ b/contrib/sendmail/cf/cf/submit.cf @@ -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@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@lab.smi.sendmail.com on Thu Jan 23 12:29:13 PST 2014 +##### in /home/ca/sm8-rel/sm-8.14.8/OpenSource/sendmail-8.14.8/cf/cf ##### using ../ as configuration include directory ##### ###################################################################### @@ -27,15 +27,15 @@ ###################################################################### ###################################################################### -##### $Id: cfhead.m4,v 8.121 2010/01/07 18:20:19 ca Exp $ ##### -##### $Id: cf.m4,v 8.32 1999/02/07 07:26:14 gshapiro Exp $ ##### -##### $Id: submit.mc,v 8.14 2006/04/05 05:54:41 ca Exp $ ##### -##### $Id: msp.m4,v 1.33 2004/02/09 22:32:38 ca 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: no_default_msa.m4,v 8.2 2001/02/14 05:03:22 gshapiro Exp $ ##### +##### $Id: no_default_msa.m4,v 8.3 2013/11/22 20:51:11 ca Exp $ ##### -##### $Id: proto.m4,v 8.760 2012/09/07 16:30:15 ca 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 @@ D{MTAHost}[127.0.0.1] # Configuration version number -DZ8.14.7/Submit +DZ8.14.8/Submit ############### @@ -1299,7 +1299,7 @@ R$* $#relay $@ ${MTAHost} $: $1 < @ $j > ### Local and Program Mailer specification ### ################################################## -##### $Id: local.m4,v 8.59 2004/11/23 00:37:25 ca Exp $ ##### +##### $Id: local.m4,v 8.60 2013/11/22 20:51:14 ca Exp $ ##### # # Envelope sender rewriting @@ -1351,7 +1351,7 @@ Mprog, P=[IPC], F=lmDFMuXk5, S=EnvFromL/HdrFromL, R=EnvToL/HdrToL, D=$z:/, ### SMTP Mailer specification ### ##################################### -##### $Id: smtp.m4,v 8.65 2006/07/12 21:08:10 ca Exp $ ##### +##### $Id: smtp.m4,v 8.66 2013/11/22 20:51:14 ca Exp $ ##### # # common sender and masquerading recipient rewriting @@ -1442,7 +1442,7 @@ Mrelay, P=[IPC], F=mDFMuXa8k, S=EnvFromSMTP/HdrFromSMTP, R=MasqSMTP, E=\r\n, L= ### submit.mc ### # divert(-1) # # -# # Copyright (c) 2001-2003 Sendmail, Inc. and its suppliers. +# # Copyright (c) 2001-2003 Proofpoint, Inc. and its suppliers. # # All rights reserved. # # # # By using this file, you agree to the terms and conditions set @@ -1457,7 +1457,7 @@ Mrelay, P=[IPC], F=mDFMuXa8k, S=EnvFromSMTP/HdrFromSMTP, R=MasqSMTP, E=\r\n, L= # # # # divert(0)dnl -# VERSIONID(`$Id: submit.mc,v 8.14 2006/04/05 05:54:41 ca 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 diff --git a/contrib/sendmail/cf/cf/submit.mc b/contrib/sendmail/cf/cf/submit.mc index d0db47805..352d246d0 100644 --- a/contrib/sendmail/cf/cf/submit.mc +++ b/contrib/sendmail/cf/cf/submit.mc @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 2001-2003 Sendmail, Inc. and its suppliers. +# Copyright (c) 2001-2003 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(-1) # divert(0)dnl -VERSIONID(`$Id: submit.mc,v 8.14 2006/04/05 05:54:41 ca 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 diff --git a/contrib/sendmail/cf/cf/tcpproto.mc b/contrib/sendmail/cf/cf/tcpproto.mc index 969cb71f2..db3fe3cb1 100644 --- a/contrib/sendmail/cf/cf/tcpproto.mc +++ b/contrib/sendmail/cf/cf/tcpproto.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: tcpproto.mc,v 8.14 2000/08/03 15:26:50 ca Exp $') +VERSIONID(`$Id: tcpproto.mc,v 8.15 2013/11/22 20:51:08 ca Exp $') OSTYPE(`unknown') FEATURE(`nouucp', `reject') MAILER(`local') diff --git a/contrib/sendmail/cf/cf/ucbarpa.mc b/contrib/sendmail/cf/cf/ucbarpa.mc index 26b2ce095..3ab8851a7 100644 --- a/contrib/sendmail/cf/cf/ucbarpa.mc +++ b/contrib/sendmail/cf/cf/ucbarpa.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: ucbarpa.mc,v 8.12 1999/02/07 07:26:05 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/ucbvax.mc b/contrib/sendmail/cf/cf/ucbvax.mc index 235d9aa25..2b49b645f 100644 --- a/contrib/sendmail/cf/cf/ucbvax.mc +++ b/contrib/sendmail/cf/cf/ucbvax.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: ucbvax.mc,v 8.14 1999/02/07 07:26:05 gshapiro 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) diff --git a/contrib/sendmail/cf/cf/uucpproto.mc b/contrib/sendmail/cf/cf/uucpproto.mc index 134c8f41b..a3cca7e6a 100644 --- a/contrib/sendmail/cf/cf/uucpproto.mc +++ b/contrib/sendmail/cf/cf/uucpproto.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: uucpproto.mc,v 8.15 1999/02/07 07:26:05 gshapiro 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 diff --git a/contrib/sendmail/cf/cf/vangogh.cs.mc b/contrib/sendmail/cf/cf/vangogh.cs.mc index 3fb48e131..49329fb42 100644 --- a/contrib/sendmail/cf/cf/vangogh.cs.mc +++ b/contrib/sendmail/cf/cf/vangogh.cs.mc @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: vangogh.cs.mc,v 8.13 1999/02/07 07:26:05 gshapiro 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 diff --git a/contrib/sendmail/cf/domain/Berkeley.EDU.m4 b/contrib/sendmail/cf/domain/Berkeley.EDU.m4 index d0fee2476..cb4c931af 100644 --- a/contrib/sendmail/cf/domain/Berkeley.EDU.m4 +++ b/contrib/sendmail/cf/domain/Berkeley.EDU.m4 @@ -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(-1) # # divert(0) -VERSIONID(`$Id: Berkeley.EDU.m4,v 8.17 1999/02/07 07:26:06 gshapiro 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 diff --git a/contrib/sendmail/cf/domain/CS.Berkeley.EDU.m4 b/contrib/sendmail/cf/domain/CS.Berkeley.EDU.m4 index 181ced145..4f6e0fc13 100644 --- a/contrib/sendmail/cf/domain/CS.Berkeley.EDU.m4 +++ b/contrib/sendmail/cf/domain/CS.Berkeley.EDU.m4 @@ -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(-1) # # divert(0) -VERSIONID(`$Id: CS.Berkeley.EDU.m4,v 8.10 1999/02/07 07:26:06 gshapiro 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', diff --git a/contrib/sendmail/cf/domain/EECS.Berkeley.EDU.m4 b/contrib/sendmail/cf/domain/EECS.Berkeley.EDU.m4 index 41a21ade2..e7607a4a7 100644 --- a/contrib/sendmail/cf/domain/EECS.Berkeley.EDU.m4 +++ b/contrib/sendmail/cf/domain/EECS.Berkeley.EDU.m4 @@ -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(-1) # # divert(0) -VERSIONID(`$Id: EECS.Berkeley.EDU.m4,v 8.10 1999/02/07 07:26:06 gshapiro 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 diff --git a/contrib/sendmail/cf/domain/S2K.Berkeley.EDU.m4 b/contrib/sendmail/cf/domain/S2K.Berkeley.EDU.m4 index 9a019ce8b..22927db28 100644 --- a/contrib/sendmail/cf/domain/S2K.Berkeley.EDU.m4 +++ b/contrib/sendmail/cf/domain/S2K.Berkeley.EDU.m4 @@ -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(-1) # # divert(0) -VERSIONID(`$Id: S2K.Berkeley.EDU.m4,v 8.10 1999/02/07 07:26:06 gshapiro 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 diff --git a/contrib/sendmail/cf/domain/berkeley-only.m4 b/contrib/sendmail/cf/domain/berkeley-only.m4 index b9a73b9b0..0e503bfc4 100644 --- a/contrib/sendmail/cf/domain/berkeley-only.m4 +++ b/contrib/sendmail/cf/domain/berkeley-only.m4 @@ -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(-1) # # divert(0) -VERSIONID(`$Id: unspecified-domain.m4,v 8.10 1999/02/07 07:26:07 gshapiro 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') diff --git a/contrib/sendmail/cf/domain/generic.m4 b/contrib/sendmail/cf/domain/generic.m4 index caa5a8845..c3d369e37 100644 --- a/contrib/sendmail/cf/domain/generic.m4 +++ b/contrib/sendmail/cf/domain/generic.m4 @@ -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(-1) # files. # divert(0) -VERSIONID(`$Id: generic.m4,v 8.15 1999/04/04 00:51:09 ca 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 diff --git a/contrib/sendmail/cf/feature/accept_unqualified_senders.m4 b/contrib/sendmail/cf/feature/accept_unqualified_senders.m4 index 4c3988493..6679adb14 100644 --- a/contrib/sendmail/cf/feature/accept_unqualified_senders.m4 +++ b/contrib/sendmail/cf/feature/accept_unqualified_senders.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: accept_unqualified_senders.m4,v 8.6 1999/02/07 07:26:07 gshapiro 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) diff --git a/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4 b/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4 index a54507c75..04014877a 100644 --- a/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4 +++ b/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: accept_unresolvable_domains.m4,v 8.10 1999/02/07 07:26:07 gshapiro 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) diff --git a/contrib/sendmail/cf/feature/access_db.m4 b/contrib/sendmail/cf/feature/access_db.m4 index 8aa90c82e..248067762 100644 --- a/contrib/sendmail/cf/feature/access_db.m4 +++ b/contrib/sendmail/cf/feature/access_db.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: access_db.m4,v 8.27 2006/07/06 21:10:10 ca Exp $') +VERSIONID(`$Id: access_db.m4,v 8.28 2013/11/22 20:51:11 ca Exp $') divert(-1) define(`_ACCESS_TABLE_', `') diff --git a/contrib/sendmail/cf/feature/allmasquerade.m4 b/contrib/sendmail/cf/feature/allmasquerade.m4 index aa264f961..e99978b04 100644 --- a/contrib/sendmail/cf/feature/allmasquerade.m4 +++ b/contrib/sendmail/cf/feature/allmasquerade.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: allmasquerade.m4,v 8.13 2000/09/12 22:00:53 ca Exp $') +VERSIONID(`$Id: allmasquerade.m4,v 8.14 2013/11/22 20:51:11 ca Exp $') divert(-1) ifdef(`_MAILER_local_', diff --git a/contrib/sendmail/cf/feature/always_add_domain.m4 b/contrib/sendmail/cf/feature/always_add_domain.m4 index a29956a63..507d55818 100644 --- a/contrib/sendmail/cf/feature/always_add_domain.m4 +++ b/contrib/sendmail/cf/feature/always_add_domain.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: always_add_domain.m4,v 8.11 2000/09/12 22:00:53 ca Exp $') +VERSIONID(`$Id: always_add_domain.m4,v 8.12 2013/11/22 20:51:11 ca Exp $') divert(-1) ifdef(`_MAILER_local_', diff --git a/contrib/sendmail/cf/feature/authinfo.m4 b/contrib/sendmail/cf/feature/authinfo.m4 index 99dd6e9e2..f5a4345b6 100644 --- a/contrib/sendmail/cf/feature/authinfo.m4 +++ b/contrib/sendmail/cf/feature/authinfo.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: authinfo.m4,v 1.9 2002/06/27 23:23:57 gshapiro Exp $') +VERSIONID(`$Id: authinfo.m4,v 1.10 2013/11/22 20:51:11 ca Exp $') divert(-1) define(`_AUTHINFO_TABLE_', `') diff --git a/contrib/sendmail/cf/feature/badmx.m4 b/contrib/sendmail/cf/feature/badmx.m4 index dc0dc8827..d1a29cdba 100644 --- a/contrib/sendmail/cf/feature/badmx.m4 +++ b/contrib/sendmail/cf/feature/badmx.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: badmx.m4,v 1.1 2006/12/16 00:56:32 ca Exp $') +VERSIONID(`$Id: badmx.m4,v 1.2 2013/11/22 20:51:11 ca Exp $') divert(-1) define(`_BADMX_CHK_', 1) diff --git a/contrib/sendmail/cf/feature/bestmx_is_local.m4 b/contrib/sendmail/cf/feature/bestmx_is_local.m4 index 911d2b542..d08e237c8 100644 --- a/contrib/sendmail/cf/feature/bestmx_is_local.m4 +++ b/contrib/sendmail/cf/feature/bestmx_is_local.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: bestmx_is_local.m4,v 8.26 2000/09/17 17:30:00 gshapiro 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_) diff --git a/contrib/sendmail/cf/feature/bitdomain.m4 b/contrib/sendmail/cf/feature/bitdomain.m4 index 2ff3fa6ee..701b0698b 100644 --- a/contrib/sendmail/cf/feature/bitdomain.m4 +++ b/contrib/sendmail/cf/feature/bitdomain.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: bitdomain.m4,v 8.30 2002/06/27 23:23:57 gshapiro Exp $') +VERSIONID(`$Id: bitdomain.m4,v 8.31 2013/11/22 20:51:11 ca Exp $') divert(-1) define(`_BITDOMAIN_TABLE_', `') diff --git a/contrib/sendmail/cf/feature/blacklist_recipients.m4 b/contrib/sendmail/cf/feature/blacklist_recipients.m4 index d6218d119..373405f61 100644 --- a/contrib/sendmail/cf/feature/blacklist_recipients.m4 +++ b/contrib/sendmail/cf/feature/blacklist_recipients.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: blacklist_recipients.m4,v 8.13 1999/04/02 02:25:13 gshapiro Exp $') +VERSIONID(`$Id: blacklist_recipients.m4,v 8.14 2013/11/22 20:51:11 ca Exp $') divert(-1) ifdef(`_ACCESS_TABLE_', diff --git a/contrib/sendmail/cf/feature/block_bad_helo.m4 b/contrib/sendmail/cf/feature/block_bad_helo.m4 index 6f6d79265..e24e22be6 100644 --- a/contrib/sendmail/cf/feature/block_bad_helo.m4 +++ b/contrib/sendmail/cf/feature/block_bad_helo.m4 @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: block_bad_helo.m4,v 1.1 2006/06/15 22:49:30 ca 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 diff --git a/contrib/sendmail/cf/feature/compat_check.m4 b/contrib/sendmail/cf/feature/compat_check.m4 index a6125edf2..694c1f529 100644 --- a/contrib/sendmail/cf/feature/compat_check.m4 +++ b/contrib/sendmail/cf/feature/compat_check.m4 @@ -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(-1) # # divert(0) -VERSIONID(`$Id: compat_check.m4,v 1.4 2002/02/26 22:15:31 gshapiro 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') diff --git a/contrib/sendmail/cf/feature/conncontrol.m4 b/contrib/sendmail/cf/feature/conncontrol.m4 index 87c23b0fd..6abe0521f 100644 --- a/contrib/sendmail/cf/feature/conncontrol.m4 +++ b/contrib/sendmail/cf/feature/conncontrol.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: conncontrol.m4,v 1.4 2004/02/19 21:31:47 ca Exp $') +VERSIONID(`$Id: conncontrol.m4,v 1.5 2013/11/22 20:51:11 ca Exp $') divert(-1) ifdef(`_ACCESS_TABLE_', ` diff --git a/contrib/sendmail/cf/feature/delay_checks.m4 b/contrib/sendmail/cf/feature/delay_checks.m4 index 151df9566..55761557a 100644 --- a/contrib/sendmail/cf/feature/delay_checks.m4 +++ b/contrib/sendmail/cf/feature/delay_checks.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: delay_checks.m4,v 8.8 2000/12/05 18:50:45 ca Exp $') +VERSIONID(`$Id: delay_checks.m4,v 8.9 2013/11/22 20:51:11 ca Exp $') divert(-1) define(`_DELAY_CHECKS_', 1) diff --git a/contrib/sendmail/cf/feature/dnsbl.m4 b/contrib/sendmail/cf/feature/dnsbl.m4 index be0e2be9e..7298ba242 100644 --- a/contrib/sendmail/cf/feature/dnsbl.m4 +++ b/contrib/sendmail/cf/feature/dnsbl.m4 @@ -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 @@ divert(-1) ifdef(`DNSBL_MAP', `', `define(`DNSBL_MAP', `dns -R A')') divert(0) ifdef(`_DNSBL_R_',`dnl',`dnl -VERSIONID(`$Id: dnsbl.m4,v 8.33 2007/01/05 18:49:29 ca 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')')') diff --git a/contrib/sendmail/cf/feature/domaintable.m4 b/contrib/sendmail/cf/feature/domaintable.m4 index fadf816ca..d857e7a9c 100644 --- a/contrib/sendmail/cf/feature/domaintable.m4 +++ b/contrib/sendmail/cf/feature/domaintable.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: domaintable.m4,v 8.24 2002/06/27 23:23:57 gshapiro Exp $') +VERSIONID(`$Id: domaintable.m4,v 8.25 2013/11/22 20:51:11 ca Exp $') divert(-1) define(`_DOMAIN_TABLE_', `') diff --git a/contrib/sendmail/cf/feature/enhdnsbl.m4 b/contrib/sendmail/cf/feature/enhdnsbl.m4 index bb467ef3e..27a3009e5 100644 --- a/contrib/sendmail/cf/feature/enhdnsbl.m4 +++ b/contrib/sendmail/cf/feature/enhdnsbl.m4 @@ -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 @@ ifelse(defn(`_ARG_'), `', `errprint(`*** ERROR: missing argument for FEATURE(`enhdnsbl')')') divert(0) ifdef(`_EDNSBL_R_',`dnl',`dnl -VERSIONID(`$Id: enhdnsbl.m4,v 1.12 2007/01/08 18:22:05 ca 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 diff --git a/contrib/sendmail/cf/feature/generics_entire_domain.m4 b/contrib/sendmail/cf/feature/generics_entire_domain.m4 index fab586af1..dd2778a95 100644 --- a/contrib/sendmail/cf/feature/generics_entire_domain.m4 +++ b/contrib/sendmail/cf/feature/generics_entire_domain.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: generics_entire_domain.m4,v 8.1 1999/03/16 00:43:05 ca 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) diff --git a/contrib/sendmail/cf/feature/genericstable.m4 b/contrib/sendmail/cf/feature/genericstable.m4 index dfdfeac86..22a7fc261 100644 --- a/contrib/sendmail/cf/feature/genericstable.m4 +++ b/contrib/sendmail/cf/feature/genericstable.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: genericstable.m4,v 8.23 2002/06/27 23:23:57 gshapiro Exp $') +VERSIONID(`$Id: genericstable.m4,v 8.24 2013/11/22 20:51:11 ca Exp $') divert(-1) define(`_GENERICS_TABLE_', `') diff --git a/contrib/sendmail/cf/feature/greet_pause.m4 b/contrib/sendmail/cf/feature/greet_pause.m4 index 1dddb58e5..cd912e7ed 100644 --- a/contrib/sendmail/cf/feature/greet_pause.m4 +++ b/contrib/sendmail/cf/feature/greet_pause.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: greet_pause.m4,v 1.4 2004/07/06 20:49:51 ca 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_', `', diff --git a/contrib/sendmail/cf/feature/ldap_routing.m4 b/contrib/sendmail/cf/feature/ldap_routing.m4 index 8959e2046..2786d71d0 100644 --- a/contrib/sendmail/cf/feature/ldap_routing.m4 +++ b/contrib/sendmail/cf/feature/ldap_routing.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: ldap_routing.m4,v 8.20 2012/01/18 22:27:06 ca 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 diff --git a/contrib/sendmail/cf/feature/limited_masquerade.m4 b/contrib/sendmail/cf/feature/limited_masquerade.m4 index f86ebd456..6f35e7702 100644 --- a/contrib/sendmail/cf/feature/limited_masquerade.m4 +++ b/contrib/sendmail/cf/feature/limited_masquerade.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: limited_masquerade.m4,v 8.9 1999/02/07 07:26:09 gshapiro Exp $') +VERSIONID(`$Id: limited_masquerade.m4,v 8.10 2013/11/22 20:51:11 ca Exp $') divert(-1) define(`_LIMITED_MASQUERADE_', 1) diff --git a/contrib/sendmail/cf/feature/local_lmtp.m4 b/contrib/sendmail/cf/feature/local_lmtp.m4 index 6f3888add..2e0ed931f 100644 --- a/contrib/sendmail/cf/feature/local_lmtp.m4 +++ b/contrib/sendmail/cf/feature/local_lmtp.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: local_lmtp.m4,v 8.17 2002/11/17 04:41:04 ca Exp $') +VERSIONID(`$Id: local_lmtp.m4,v 8.18 2013/11/22 20:51:11 ca Exp $') divert(-1) ifdef(`_MAILER_local_', diff --git a/contrib/sendmail/cf/feature/local_no_masquerade.m4 b/contrib/sendmail/cf/feature/local_no_masquerade.m4 index de2300f2f..ef9b5cfb6 100644 --- a/contrib/sendmail/cf/feature/local_no_masquerade.m4 +++ b/contrib/sendmail/cf/feature/local_no_masquerade.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: local_no_masquerade.m4,v 1.2 2000/08/03 15:54:59 ca Exp $') +VERSIONID(`$Id: local_no_masquerade.m4,v 1.3 2013/11/22 20:51:11 ca Exp $') divert(-1) ifdef(`_MAILER_local_', diff --git a/contrib/sendmail/cf/feature/local_procmail.m4 b/contrib/sendmail/cf/feature/local_procmail.m4 index 694c3d9ef..778f58e0d 100644 --- a/contrib/sendmail/cf/feature/local_procmail.m4 +++ b/contrib/sendmail/cf/feature/local_procmail.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: local_procmail.m4,v 8.22 2002/11/17 04:24:19 ca Exp $') +VERSIONID(`$Id: local_procmail.m4,v 8.23 2013/11/22 20:51:11 ca Exp $') divert(-1) ifdef(`_MAILER_local_', diff --git a/contrib/sendmail/cf/feature/lookupdotdomain.m4 b/contrib/sendmail/cf/feature/lookupdotdomain.m4 index f8c2a31f3..570807832 100644 --- a/contrib/sendmail/cf/feature/lookupdotdomain.m4 +++ b/contrib/sendmail/cf/feature/lookupdotdomain.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: lookupdotdomain.m4,v 1.1 2000/04/13 22:32:49 ca Exp $') +VERSIONID(`$Id: lookupdotdomain.m4,v 1.2 2013/11/22 20:51:11 ca Exp $') divert(-1) ifdef(`_ACCESS_TABLE_', diff --git a/contrib/sendmail/cf/feature/loose_relay_check.m4 b/contrib/sendmail/cf/feature/loose_relay_check.m4 index abd1b9c9f..675b7b3e1 100644 --- a/contrib/sendmail/cf/feature/loose_relay_check.m4 +++ b/contrib/sendmail/cf/feature/loose_relay_check.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: loose_relay_check.m4,v 8.6 1999/02/07 07:26:10 gshapiro 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) diff --git a/contrib/sendmail/cf/feature/mailertable.m4 b/contrib/sendmail/cf/feature/mailertable.m4 index e3e1d0344..38ebe68d4 100644 --- a/contrib/sendmail/cf/feature/mailertable.m4 +++ b/contrib/sendmail/cf/feature/mailertable.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: mailertable.m4,v 8.25 2002/06/27 23:23:57 gshapiro Exp $') +VERSIONID(`$Id: mailertable.m4,v 8.26 2013/11/22 20:51:11 ca Exp $') divert(-1) define(`_MAILER_TABLE_', `') diff --git a/contrib/sendmail/cf/feature/masquerade_entire_domain.m4 b/contrib/sendmail/cf/feature/masquerade_entire_domain.m4 index e2bcc6506..d31b09b7a 100644 --- a/contrib/sendmail/cf/feature/masquerade_entire_domain.m4 +++ b/contrib/sendmail/cf/feature/masquerade_entire_domain.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: masquerade_entire_domain.m4,v 8.9 1999/02/07 07:26:10 gshapiro 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) diff --git a/contrib/sendmail/cf/feature/masquerade_envelope.m4 b/contrib/sendmail/cf/feature/masquerade_envelope.m4 index 74d3aa056..336c40342 100644 --- a/contrib/sendmail/cf/feature/masquerade_envelope.m4 +++ b/contrib/sendmail/cf/feature/masquerade_envelope.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: masquerade_envelope.m4,v 8.9 1999/02/07 07:26:10 gshapiro Exp $') +VERSIONID(`$Id: masquerade_envelope.m4,v 8.10 2013/11/22 20:51:11 ca Exp $') divert(-1) define(`_MASQUERADE_ENVELOPE_', 1) diff --git a/contrib/sendmail/cf/feature/msp.m4 b/contrib/sendmail/cf/feature/msp.m4 index 6ecf33425..e838b4372 100644 --- a/contrib/sendmail/cf/feature/msp.m4 +++ b/contrib/sendmail/cf/feature/msp.m4 @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: msp.m4,v 1.33 2004/02/09 22:32:38 ca 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') diff --git a/contrib/sendmail/cf/feature/mtamark.m4 b/contrib/sendmail/cf/feature/mtamark.m4 index c306c44e3..021497524 100644 --- a/contrib/sendmail/cf/feature/mtamark.m4 +++ b/contrib/sendmail/cf/feature/mtamark.m4 @@ -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(-1) divert(0) ifdef(`_MTAMARK_R',`dnl',`dnl -VERSIONID(`$Id: mtamark.m4,v 1.2 2005/07/25 20:56:53 ca 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 diff --git a/contrib/sendmail/cf/feature/no_default_msa.m4 b/contrib/sendmail/cf/feature/no_default_msa.m4 index 5a053399f..778f88e35 100644 --- a/contrib/sendmail/cf/feature/no_default_msa.m4 +++ b/contrib/sendmail/cf/feature/no_default_msa.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: no_default_msa.m4,v 8.2 2001/02/14 05:03:22 gshapiro Exp $') +VERSIONID(`$Id: no_default_msa.m4,v 8.3 2013/11/22 20:51:11 ca Exp $') divert(-1) define(`_NO_MSA_', `1') diff --git a/contrib/sendmail/cf/feature/nocanonify.m4 b/contrib/sendmail/cf/feature/nocanonify.m4 index 05baa7a47..189a4d2c7 100644 --- a/contrib/sendmail/cf/feature/nocanonify.m4 +++ b/contrib/sendmail/cf/feature/nocanonify.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: nocanonify.m4,v 8.12 1999/08/28 00:42:01 ca Exp $') +VERSIONID(`$Id: nocanonify.m4,v 8.13 2013/11/22 20:51:11 ca Exp $') divert(-1) define(`_NO_CANONIFY_', 1) diff --git a/contrib/sendmail/cf/feature/notsticky.m4 b/contrib/sendmail/cf/feature/notsticky.m4 index 1cecca5f1..f32d90339 100644 --- a/contrib/sendmail/cf/feature/notsticky.m4 +++ b/contrib/sendmail/cf/feature/notsticky.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: notsticky.m4,v 8.11 1999/02/07 07:26:11 gshapiro 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. diff --git a/contrib/sendmail/cf/feature/nouucp.m4 b/contrib/sendmail/cf/feature/nouucp.m4 index a03104964..26be26a52 100644 --- a/contrib/sendmail/cf/feature/nouucp.m4 +++ b/contrib/sendmail/cf/feature/nouucp.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: nouucp.m4,v 8.13 1999/11/24 18:37:07 ca Exp $') +VERSIONID(`$Id: nouucp.m4,v 8.14 2013/11/22 20:51:11 ca Exp $') divert(-1) ifelse(defn(`_ARG_'), `', diff --git a/contrib/sendmail/cf/feature/nullclient.m4 b/contrib/sendmail/cf/feature/nullclient.m4 index 8f35ca1c1..32f57d604 100644 --- a/contrib/sendmail/cf/feature/nullclient.m4 +++ b/contrib/sendmail/cf/feature/nullclient.m4 @@ -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 @@ ifelse(defn(`_ARG_'), `', `errprint(`Feature "nullclient" requires argument')', # divert(0) -VERSIONID(`$Id: nullclient.m4,v 8.24 2000/09/17 17:30:00 gshapiro Exp $') +VERSIONID(`$Id: nullclient.m4,v 8.25 2013/11/22 20:51:11 ca Exp $') divert(-1) undefine(`ALIAS_FILE') diff --git a/contrib/sendmail/cf/feature/preserve_local_plus_detail.m4 b/contrib/sendmail/cf/feature/preserve_local_plus_detail.m4 index bb603a607..983f6eaad 100644 --- a/contrib/sendmail/cf/feature/preserve_local_plus_detail.m4 +++ b/contrib/sendmail/cf/feature/preserve_local_plus_detail.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: preserve_local_plus_detail.m4,v 8.1 2000/04/10 05:48:05 gshapiro 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') diff --git a/contrib/sendmail/cf/feature/preserve_luser_host.m4 b/contrib/sendmail/cf/feature/preserve_luser_host.m4 index 837da99fe..d9af4fb53 100644 --- a/contrib/sendmail/cf/feature/preserve_luser_host.m4 +++ b/contrib/sendmail/cf/feature/preserve_luser_host.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: preserve_luser_host.m4,v 1.3 2002/04/14 13:22:58 ca Exp $') +VERSIONID(`$Id: preserve_luser_host.m4,v 1.4 2013/11/22 20:51:11 ca Exp $') divert(-1) ifdef(`LUSER_RELAY', `', diff --git a/contrib/sendmail/cf/feature/promiscuous_relay.m4 b/contrib/sendmail/cf/feature/promiscuous_relay.m4 index 17cb7d1d8..21fd40ffe 100644 --- a/contrib/sendmail/cf/feature/promiscuous_relay.m4 +++ b/contrib/sendmail/cf/feature/promiscuous_relay.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: promiscuous_relay.m4,v 8.12 2001/02/06 17:14:35 ca Exp $') +VERSIONID(`$Id: promiscuous_relay.m4,v 8.13 2013/11/22 20:51:11 ca Exp $') divert(-1) define(`_PROMISCUOUS_RELAY_', 1) diff --git a/contrib/sendmail/cf/feature/queuegroup.m4 b/contrib/sendmail/cf/feature/queuegroup.m4 index 06715a0f3..a7653d36e 100644 --- a/contrib/sendmail/cf/feature/queuegroup.m4 +++ b/contrib/sendmail/cf/feature/queuegroup.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: queuegroup.m4,v 1.4 2001/03/28 00:39:39 ca Exp $') +VERSIONID(`$Id: queuegroup.m4,v 1.5 2013/11/22 20:51:11 ca Exp $') divert(-1) ifdef(`_ACCESS_TABLE_', `', diff --git a/contrib/sendmail/cf/feature/ratecontrol.m4 b/contrib/sendmail/cf/feature/ratecontrol.m4 index e3389c0c1..5aa5bc511 100644 --- a/contrib/sendmail/cf/feature/ratecontrol.m4 +++ b/contrib/sendmail/cf/feature/ratecontrol.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: ratecontrol.m4,v 1.5 2004/02/19 21:31:47 ca Exp $') +VERSIONID(`$Id: ratecontrol.m4,v 1.6 2013/11/22 20:51:11 ca Exp $') divert(-1) ifdef(`_ACCESS_TABLE_', ` diff --git a/contrib/sendmail/cf/feature/redirect.m4 b/contrib/sendmail/cf/feature/redirect.m4 index e167865ef..c932b7f0e 100644 --- a/contrib/sendmail/cf/feature/redirect.m4 +++ b/contrib/sendmail/cf/feature/redirect.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: redirect.m4,v 8.15 1999/08/06 01:47:36 gshapiro Exp $') +VERSIONID(`$Id: redirect.m4,v 8.16 2013/11/22 20:51:11 ca Exp $') divert(-1) LOCAL_RULE_0 diff --git a/contrib/sendmail/cf/feature/relay_based_on_MX.m4 b/contrib/sendmail/cf/feature/relay_based_on_MX.m4 index 872680a48..244120448 100644 --- a/contrib/sendmail/cf/feature/relay_based_on_MX.m4 +++ b/contrib/sendmail/cf/feature/relay_based_on_MX.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: relay_based_on_MX.m4,v 8.11 1999/04/02 02:25:13 gshapiro 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) diff --git a/contrib/sendmail/cf/feature/relay_entire_domain.m4 b/contrib/sendmail/cf/feature/relay_entire_domain.m4 index a720b167f..eddb35aba 100644 --- a/contrib/sendmail/cf/feature/relay_entire_domain.m4 +++ b/contrib/sendmail/cf/feature/relay_entire_domain.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: relay_entire_domain.m4,v 8.10 1999/02/07 07:26:12 gshapiro 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) diff --git a/contrib/sendmail/cf/feature/relay_hosts_only.m4 b/contrib/sendmail/cf/feature/relay_hosts_only.m4 index 867d4eda6..601021039 100644 --- a/contrib/sendmail/cf/feature/relay_hosts_only.m4 +++ b/contrib/sendmail/cf/feature/relay_hosts_only.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: relay_hosts_only.m4,v 8.10 1999/02/07 07:26:12 gshapiro 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) diff --git a/contrib/sendmail/cf/feature/relay_local_from.m4 b/contrib/sendmail/cf/feature/relay_local_from.m4 index 9858eb8e3..919dfc0f4 100644 --- a/contrib/sendmail/cf/feature/relay_local_from.m4 +++ b/contrib/sendmail/cf/feature/relay_local_from.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: relay_local_from.m4,v 8.6 2001/02/06 15:55:21 ca 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) diff --git a/contrib/sendmail/cf/feature/relay_mail_from.m4 b/contrib/sendmail/cf/feature/relay_mail_from.m4 index 44bcbd670..c16cfed16 100644 --- a/contrib/sendmail/cf/feature/relay_mail_from.m4 +++ b/contrib/sendmail/cf/feature/relay_mail_from.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: relay_mail_from.m4,v 8.3 2001/02/06 16:07:12 ca Exp $') +VERSIONID(`$Id: relay_mail_from.m4,v 8.4 2013/11/22 20:51:11 ca Exp $') divert(-1) ifdef(`_ACCESS_TABLE_', diff --git a/contrib/sendmail/cf/feature/require_rdns.m4 b/contrib/sendmail/cf/feature/require_rdns.m4 index 4c70d3a68..0dc2d072d 100644 --- a/contrib/sendmail/cf/feature/require_rdns.m4 +++ b/contrib/sendmail/cf/feature/require_rdns.m4 @@ -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(-1) # divert(0)dnl -VERSIONID(`$Id: require_rdns.m4,v 1.1 2006/06/15 22:49:30 ca Exp $') +VERSIONID(`$Id: require_rdns.m4,v 1.2 2013/11/22 20:51:11 ca Exp $') divert(-1) define(`_REQUIRE_RDNS_', `') diff --git a/contrib/sendmail/cf/feature/smrsh.m4 b/contrib/sendmail/cf/feature/smrsh.m4 index 2159ff858..e7070d945 100644 --- a/contrib/sendmail/cf/feature/smrsh.m4 +++ b/contrib/sendmail/cf/feature/smrsh.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: smrsh.m4,v 8.14 1999/11/18 05:06:23 ca Exp $') +VERSIONID(`$Id: smrsh.m4,v 8.15 2013/11/22 20:51:11 ca Exp $') divert(-1) ifdef(`_MAILER_local_', diff --git a/contrib/sendmail/cf/feature/stickyhost.m4 b/contrib/sendmail/cf/feature/stickyhost.m4 index 1e95be44b..372e4f14b 100644 --- a/contrib/sendmail/cf/feature/stickyhost.m4 +++ b/contrib/sendmail/cf/feature/stickyhost.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: stickyhost.m4,v 8.9 1999/02/07 07:26:13 gshapiro Exp $') +VERSIONID(`$Id: stickyhost.m4,v 8.10 2013/11/22 20:51:11 ca Exp $') divert(-1) define(`_STICKY_LOCAL_DOMAIN_', 1) diff --git a/contrib/sendmail/cf/feature/use_client_ptr.m4 b/contrib/sendmail/cf/feature/use_client_ptr.m4 index 918dff13c..2971941a5 100644 --- a/contrib/sendmail/cf/feature/use_client_ptr.m4 +++ b/contrib/sendmail/cf/feature/use_client_ptr.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: use_client_ptr.m4,v 1.1 2004/04/20 22:27:14 ca 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 diff --git a/contrib/sendmail/cf/feature/use_ct_file.m4 b/contrib/sendmail/cf/feature/use_ct_file.m4 index 9e372ec56..10c192847 100644 --- a/contrib/sendmail/cf/feature/use_ct_file.m4 +++ b/contrib/sendmail/cf/feature/use_ct_file.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: use_ct_file.m4,v 8.11 2001/08/26 20:58:57 gshapiro 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 diff --git a/contrib/sendmail/cf/feature/use_cw_file.m4 b/contrib/sendmail/cf/feature/use_cw_file.m4 index 7058cab14..20f9bec47 100644 --- a/contrib/sendmail/cf/feature/use_cw_file.m4 +++ b/contrib/sendmail/cf/feature/use_cw_file.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: use_cw_file.m4,v 8.11 2001/08/26 20:58:57 gshapiro 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 diff --git a/contrib/sendmail/cf/feature/uucpdomain.m4 b/contrib/sendmail/cf/feature/uucpdomain.m4 index c6fbc5cc3..ddf3d9999 100644 --- a/contrib/sendmail/cf/feature/uucpdomain.m4 +++ b/contrib/sendmail/cf/feature/uucpdomain.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: uucpdomain.m4,v 8.29 2002/06/27 23:23:57 gshapiro Exp $') +VERSIONID(`$Id: uucpdomain.m4,v 8.30 2013/11/22 20:51:11 ca Exp $') divert(-1) define(`_UUDOMAIN_TABLE_', `') diff --git a/contrib/sendmail/cf/feature/virtuser_entire_domain.m4 b/contrib/sendmail/cf/feature/virtuser_entire_domain.m4 index 5a1d9f0e9..e5d498752 100644 --- a/contrib/sendmail/cf/feature/virtuser_entire_domain.m4 +++ b/contrib/sendmail/cf/feature/virtuser_entire_domain.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: virtuser_entire_domain.m4,v 8.2 1999/03/16 00:43:05 ca 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) diff --git a/contrib/sendmail/cf/feature/virtusertable.m4 b/contrib/sendmail/cf/feature/virtusertable.m4 index 1717b663b..cc4379095 100644 --- a/contrib/sendmail/cf/feature/virtusertable.m4 +++ b/contrib/sendmail/cf/feature/virtusertable.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: virtusertable.m4,v 8.23 2002/06/27 23:23:57 gshapiro Exp $') +VERSIONID(`$Id: virtusertable.m4,v 8.24 2013/11/22 20:51:11 ca Exp $') divert(-1) define(`_VIRTUSER_TABLE_', `') diff --git a/contrib/sendmail/cf/hack/cssubdomain.m4 b/contrib/sendmail/cf/hack/cssubdomain.m4 index 9b0e76a2e..4a6bca51a 100644 --- a/contrib/sendmail/cf/hack/cssubdomain.m4 +++ b/contrib/sendmail/cf/hack/cssubdomain.m4 @@ -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(-1) # # divert(0) -VERSIONID(`$Id: cssubdomain.m4,v 8.9 1999/02/07 07:26:14 gshapiro 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 diff --git a/contrib/sendmail/cf/m4/cf.m4 b/contrib/sendmail/cf/m4/cf.m4 index 4f5712b1d..871b98fa6 100644 --- a/contrib/sendmail/cf/m4/cf.m4 +++ b/contrib/sendmail/cf/m4/cf.m4 @@ -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 @@ ifdef(`_CF_DIR_', `', divert(0)dnl ifdef(`OSTYPE', `dnl', `include(_CF_DIR_`'m4/cfhead.m4)dnl -VERSIONID(`$Id: cf.m4,v 8.32 1999/02/07 07:26:14 gshapiro Exp $')') +VERSIONID(`$Id: cf.m4,v 8.33 2013/11/22 20:51:13 ca Exp $')') diff --git a/contrib/sendmail/cf/m4/cfhead.m4 b/contrib/sendmail/cf/m4/cfhead.m4 index fbb9476b7..729d23cdd 100644 --- a/contrib/sendmail/cf/m4/cfhead.m4 +++ b/contrib/sendmail/cf/m4/cfhead.m4 @@ -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 @@ -309,4 +309,4 @@ define(`confMILTER_MACROS_EOM', `{msg_id}') divert(0)dnl -VERSIONID(`$Id: cfhead.m4,v 8.121 2010/01/07 18:20:19 ca Exp $') +VERSIONID(`$Id: cfhead.m4,v 8.122 2013/11/22 20:51:13 ca Exp $') diff --git a/contrib/sendmail/cf/m4/proto.m4 b/contrib/sendmail/cf/m4/proto.m4 index 9eae488a0..79667c177 100644 --- a/contrib/sendmail/cf/m4/proto.m4 +++ b/contrib/sendmail/cf/m4/proto.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: proto.m4,v 8.760 2012/09/07 16:30:15 ca 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')') @@ -2395,6 +2395,8 @@ dnl Reject our hostname 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 diff --git a/contrib/sendmail/cf/m4/version.m4 b/contrib/sendmail/cf/m4/version.m4 index bc6fde29d..ba2d36ab3 100644 --- a/contrib/sendmail/cf/m4/version.m4 +++ b/contrib/sendmail/cf/m4/version.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998-2013 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-2013 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 @@ divert(-1) # the sendmail distribution. # # -VERSIONID(`$Id: version.m4,v 8.230 2013/04/18 15:07:16 ca Exp $') +VERSIONID(`$Id: version.m4,v 8.236 2013/11/27 00:38:51 ca Exp $') # divert(0) # Configuration version number -DZ8.14.7`'ifdef(`confCF_VERSION', `/confCF_VERSION') +DZ8.14.8`'ifdef(`confCF_VERSION', `/confCF_VERSION') diff --git a/contrib/sendmail/cf/mailer/cyrus.m4 b/contrib/sendmail/cf/mailer/cyrus.m4 index cca7f8e68..4189b9516 100644 --- a/contrib/sendmail/cf/mailer/cyrus.m4 +++ b/contrib/sendmail/cf/mailer/cyrus.m4 @@ -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 @@ POPDIVERT ### Cyrus Mailer specification ### ################################################## -VERSIONID(`$Id: cyrus.m4,v 8.23 2001/11/12 23:11:34 ca 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 diff --git a/contrib/sendmail/cf/mailer/cyrusv2.m4 b/contrib/sendmail/cf/mailer/cyrusv2.m4 index 2a40a23d4..cd2809b53 100644 --- a/contrib/sendmail/cf/mailer/cyrusv2.m4 +++ b/contrib/sendmail/cf/mailer/cyrusv2.m4 @@ -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 @@ POPDIVERT ### Cyrus V2 Mailer specification ### ######################################### -VERSIONID(`$Id: cyrusv2.m4,v 1.1 2002/06/01 21:14:57 ca 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, diff --git a/contrib/sendmail/cf/mailer/fax.m4 b/contrib/sendmail/cf/mailer/fax.m4 index 4e2116e65..cb4399ced 100644 --- a/contrib/sendmail/cf/mailer/fax.m4 +++ b/contrib/sendmail/cf/mailer/fax.m4 @@ -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 @@ POPDIVERT ### FAX Mailer specification ### #################################### -VERSIONID(`$Id: fax.m4,v 8.16 2001/11/12 23:11:34 ca 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 diff --git a/contrib/sendmail/cf/mailer/local.m4 b/contrib/sendmail/cf/mailer/local.m4 index e2f971140..d4a272cda 100644 --- a/contrib/sendmail/cf/mailer/local.m4 +++ b/contrib/sendmail/cf/mailer/local.m4 @@ -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 @@ POPDIVERT ### Local and Program Mailer specification ### ################################################## -VERSIONID(`$Id: local.m4,v 8.59 2004/11/23 00:37:25 ca Exp $') +VERSIONID(`$Id: local.m4,v 8.60 2013/11/22 20:51:14 ca Exp $') # # Envelope sender rewriting diff --git a/contrib/sendmail/cf/mailer/mail11.m4 b/contrib/sendmail/cf/mailer/mail11.m4 index 14bc79458..05a291c8c 100644 --- a/contrib/sendmail/cf/mailer/mail11.m4 +++ b/contrib/sendmail/cf/mailer/mail11.m4 @@ -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 @@ POPDIVERT ### UTK-MAIL11 Mailer specification ### ########################################### -VERSIONID(`$Id: mail11.m4,v 8.22 2001/11/12 23:11:34 ca 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 diff --git a/contrib/sendmail/cf/mailer/phquery.m4 b/contrib/sendmail/cf/mailer/phquery.m4 index 58b71b07a..940efe186 100644 --- a/contrib/sendmail/cf/mailer/phquery.m4 +++ b/contrib/sendmail/cf/mailer/phquery.m4 @@ -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 @@ POPDIVERT ### PH Mailer specification ### #################################### -VERSIONID(`$Id: phquery.m4,v 8.17 2001/11/12 23:11:34 ca 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 diff --git a/contrib/sendmail/cf/mailer/pop.m4 b/contrib/sendmail/cf/mailer/pop.m4 index d2680e1ca..053b2aa89 100644 --- a/contrib/sendmail/cf/mailer/pop.m4 +++ b/contrib/sendmail/cf/mailer/pop.m4 @@ -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 @@ POPDIVERT ### POP Mailer specification ### #################################### -VERSIONID(`$Id: pop.m4,v 8.22 2001/11/12 23:11:34 ca 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 diff --git a/contrib/sendmail/cf/mailer/procmail.m4 b/contrib/sendmail/cf/mailer/procmail.m4 index 103e042a7..bdbae471d 100644 --- a/contrib/sendmail/cf/mailer/procmail.m4 +++ b/contrib/sendmail/cf/mailer/procmail.m4 @@ -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 @@ POPDIVERT ### PROCMAIL Mailer specification ### ##################*****################## -VERSIONID(`$Id: procmail.m4,v 8.22 2001/11/12 23:11:34 ca 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 diff --git a/contrib/sendmail/cf/mailer/qpage.m4 b/contrib/sendmail/cf/mailer/qpage.m4 index b0d9d51eb..057bcf879 100644 --- a/contrib/sendmail/cf/mailer/qpage.m4 +++ b/contrib/sendmail/cf/mailer/qpage.m4 @@ -3,7 +3,7 @@ PUSHDIVERT(-1) # 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 @@ POPDIVERT ### QPAGE Mailer specification ### ###################################### -VERSIONID(`$Id: qpage.m4,v 8.10 2001/11/12 23:11:34 ca 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 diff --git a/contrib/sendmail/cf/mailer/smtp.m4 b/contrib/sendmail/cf/mailer/smtp.m4 index 7010461c8..34bd43803 100644 --- a/contrib/sendmail/cf/mailer/smtp.m4 +++ b/contrib/sendmail/cf/mailer/smtp.m4 @@ -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 @@ POPDIVERT ### SMTP Mailer specification ### ##################################### -VERSIONID(`$Id: smtp.m4,v 8.65 2006/07/12 21:08:10 ca Exp $') +VERSIONID(`$Id: smtp.m4,v 8.66 2013/11/22 20:51:14 ca Exp $') # # common sender and masquerading recipient rewriting diff --git a/contrib/sendmail/cf/mailer/usenet.m4 b/contrib/sendmail/cf/mailer/usenet.m4 index 39f49b8bf..18dcf75b5 100644 --- a/contrib/sendmail/cf/mailer/usenet.m4 +++ b/contrib/sendmail/cf/mailer/usenet.m4 @@ -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 @@ POPDIVERT ### USENET Mailer specification ### #################################### -VERSIONID(`$Id: usenet.m4,v 8.22 2003/02/20 21:16:13 ca 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 diff --git a/contrib/sendmail/cf/mailer/uucp.m4 b/contrib/sendmail/cf/mailer/uucp.m4 index 651355607..0ee24733a 100644 --- a/contrib/sendmail/cf/mailer/uucp.m4 +++ b/contrib/sendmail/cf/mailer/uucp.m4 @@ -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 @@ POPDIVERT ### UUCP Mailer specification ### ##################################### -VERSIONID(`$Id: uucp.m4,v 8.44 2001/08/24 19:49:08 ca Exp $') +VERSIONID(`$Id: uucp.m4,v 8.45 2013/11/22 20:51:14 ca Exp $') # # envelope and header sender rewriting diff --git a/contrib/sendmail/cf/ostype/a-ux.m4 b/contrib/sendmail/cf/ostype/a-ux.m4 index c4d4321bc..5587bb379 100644 --- a/contrib/sendmail/cf/ostype/a-ux.m4 +++ b/contrib/sendmail/cf/ostype/a-ux.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: a-ux.m4,v 8.2 2001/07/23 16:19:36 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/aix3.m4 b/contrib/sendmail/cf/ostype/aix3.m4 index 4376f6770..dd36f60fe 100644 --- a/contrib/sendmail/cf/ostype/aix3.m4 +++ b/contrib/sendmail/cf/ostype/aix3.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: aix3.m4,v 8.16 1999/04/12 17:34:36 ca 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 diff --git a/contrib/sendmail/cf/ostype/aix4.m4 b/contrib/sendmail/cf/ostype/aix4.m4 index 8e0b9d44a..35dac65db 100644 --- a/contrib/sendmail/cf/ostype/aix4.m4 +++ b/contrib/sendmail/cf/ostype/aix4.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: aix4.m4,v 8.11 1999/04/12 17:34:37 ca 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 diff --git a/contrib/sendmail/cf/ostype/aix5.m4 b/contrib/sendmail/cf/ostype/aix5.m4 index e8df77e30..0131b924a 100644 --- a/contrib/sendmail/cf/ostype/aix5.m4 +++ b/contrib/sendmail/cf/ostype/aix5.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: aix5.m4,v 1.1 2000/12/08 21:53:36 ca 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 diff --git a/contrib/sendmail/cf/ostype/altos.m4 b/contrib/sendmail/cf/ostype/altos.m4 index 1cffe1e8d..7136343ec 100644 --- a/contrib/sendmail/cf/ostype/altos.m4 +++ b/contrib/sendmail/cf/ostype/altos.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: altos.m4,v 8.15 1999/04/24 05:37:40 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/amdahl-uts.m4 b/contrib/sendmail/cf/ostype/amdahl-uts.m4 index edd3a5db8..10ecae928 100644 --- a/contrib/sendmail/cf/ostype/amdahl-uts.m4 +++ b/contrib/sendmail/cf/ostype/amdahl-uts.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: amdahl-uts.m4,v 8.16 1999/04/24 05:37:40 gshapiro Exp $') +VERSIONID(`$Id: amdahl-uts.m4,v 8.17 2013/11/22 20:51:15 ca Exp $') divert(-1) _DEFIFNOT(`LOCAL_MAILER_FLAGS', `fSn9') diff --git a/contrib/sendmail/cf/ostype/bsd4.3.m4 b/contrib/sendmail/cf/ostype/bsd4.3.m4 index 044f205ff..bca8a1905 100644 --- a/contrib/sendmail/cf/ostype/bsd4.3.m4 +++ b/contrib/sendmail/cf/ostype/bsd4.3.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: bsd4.3.m4,v 8.12 1999/02/07 07:26:18 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/bsd4.4.m4 b/contrib/sendmail/cf/ostype/bsd4.4.m4 index 3f7b0891d..3f7bf2990 100644 --- a/contrib/sendmail/cf/ostype/bsd4.4.m4 +++ b/contrib/sendmail/cf/ostype/bsd4.4.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: bsd4.4.m4,v 8.14 1999/04/24 05:37:40 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/bsdi.m4 b/contrib/sendmail/cf/ostype/bsdi.m4 index 35679bcf1..e7b144d0b 100644 --- a/contrib/sendmail/cf/ostype/bsdi.m4 +++ b/contrib/sendmail/cf/ostype/bsdi.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: bsdi.m4,v 8.1 1999/11/19 05:18:13 gshapiro Exp $') +VERSIONID(`$Id: bsdi.m4,v 8.2 2013/11/22 20:51:15 ca Exp $') include(_CF_DIR_`'ostype/bsd4.4.m4)dnl diff --git a/contrib/sendmail/cf/ostype/bsdi1.0.m4 b/contrib/sendmail/cf/ostype/bsdi1.0.m4 index b806a37a3..02a54862d 100644 --- a/contrib/sendmail/cf/ostype/bsdi1.0.m4 +++ b/contrib/sendmail/cf/ostype/bsdi1.0.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: bsdi1.0.m4,v 8.11 1999/11/19 05:18:14 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/bsdi2.0.m4 b/contrib/sendmail/cf/ostype/bsdi2.0.m4 index 493406fd3..43922fd26 100644 --- a/contrib/sendmail/cf/ostype/bsdi2.0.m4 +++ b/contrib/sendmail/cf/ostype/bsdi2.0.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: bsdi2.0.m4,v 8.10 1999/11/19 05:18:14 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/darwin.m4 b/contrib/sendmail/cf/ostype/darwin.m4 index ee5abe703..a5fb99a8d 100644 --- a/contrib/sendmail/cf/ostype/darwin.m4 +++ b/contrib/sendmail/cf/ostype/darwin.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: darwin.m4,v 8.4 2005/06/30 01:16:04 ca 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 diff --git a/contrib/sendmail/cf/ostype/dgux.m4 b/contrib/sendmail/cf/ostype/dgux.m4 index 335aedac8..e9ffad281 100644 --- a/contrib/sendmail/cf/ostype/dgux.m4 +++ b/contrib/sendmail/cf/ostype/dgux.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: dgux.m4,v 8.14 1999/04/12 17:34:37 ca 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 diff --git a/contrib/sendmail/cf/ostype/domainos.m4 b/contrib/sendmail/cf/ostype/domainos.m4 index 759459d32..c11cffb2f 100644 --- a/contrib/sendmail/cf/ostype/domainos.m4 +++ b/contrib/sendmail/cf/ostype/domainos.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: domainos.m4,v 8.14 1999/04/24 05:37:40 gshapiro 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)') diff --git a/contrib/sendmail/cf/ostype/dragonfly.m4 b/contrib/sendmail/cf/ostype/dragonfly.m4 index c1266afe8..05124aa0c 100644 --- a/contrib/sendmail/cf/ostype/dragonfly.m4 +++ b/contrib/sendmail/cf/ostype/dragonfly.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: dragonfly.m4,v 1.1 2004/08/06 03:54:05 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/dynix3.2.m4 b/contrib/sendmail/cf/ostype/dynix3.2.m4 index e0729531e..4ef2d962b 100644 --- a/contrib/sendmail/cf/ostype/dynix3.2.m4 +++ b/contrib/sendmail/cf/ostype/dynix3.2.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: dynix3.2.m4,v 8.14 1999/04/24 05:37:41 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/freebsd4.m4 b/contrib/sendmail/cf/ostype/freebsd4.m4 index b84a1e2e5..590bbae23 100644 --- a/contrib/sendmail/cf/ostype/freebsd4.m4 +++ b/contrib/sendmail/cf/ostype/freebsd4.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: freebsd4.m4,v 1.1 2001/03/21 22:44:58 ca 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 diff --git a/contrib/sendmail/cf/ostype/freebsd5.m4 b/contrib/sendmail/cf/ostype/freebsd5.m4 index eb7a73a0d..2dc90c4b3 100644 --- a/contrib/sendmail/cf/ostype/freebsd5.m4 +++ b/contrib/sendmail/cf/ostype/freebsd5.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: freebsd5.m4,v 1.1 2001/10/08 22:25:34 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/freebsd6.m4 b/contrib/sendmail/cf/ostype/freebsd6.m4 index dde1d3f41..183e63ea1 100644 --- a/contrib/sendmail/cf/ostype/freebsd6.m4 +++ b/contrib/sendmail/cf/ostype/freebsd6.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: freebsd6.m4,v 1.1 2005/06/14 02:16:35 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/gnu.m4 b/contrib/sendmail/cf/ostype/gnu.m4 index 39e8171ca..e1db59829 100644 --- a/contrib/sendmail/cf/ostype/gnu.m4 +++ b/contrib/sendmail/cf/ostype/gnu.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: gnu.m4,v 8.13 1999/04/24 05:37:41 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/hpux10.m4 b/contrib/sendmail/cf/ostype/hpux10.m4 index 290c0c682..ccfb9c0a7 100644 --- a/contrib/sendmail/cf/ostype/hpux10.m4 +++ b/contrib/sendmail/cf/ostype/hpux10.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: hpux10.m4,v 8.19 1999/04/24 05:37:41 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/hpux11.m4 b/contrib/sendmail/cf/ostype/hpux11.m4 index 94e2e98f1..1b7e2f02e 100644 --- a/contrib/sendmail/cf/ostype/hpux11.m4 +++ b/contrib/sendmail/cf/ostype/hpux11.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: hpux11.m4,v 8.1 1999/11/19 05:22:59 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/hpux9.m4 b/contrib/sendmail/cf/ostype/hpux9.m4 index 902d39a65..a630c6463 100644 --- a/contrib/sendmail/cf/ostype/hpux9.m4 +++ b/contrib/sendmail/cf/ostype/hpux9.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: hpux9.m4,v 8.24 1999/04/24 05:37:41 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/irix4.m4 b/contrib/sendmail/cf/ostype/irix4.m4 index f966458f9..d2c436775 100644 --- a/contrib/sendmail/cf/ostype/irix4.m4 +++ b/contrib/sendmail/cf/ostype/irix4.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: irix4.m4,v 8.19 1999/04/24 05:37:41 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/irix5.m4 b/contrib/sendmail/cf/ostype/irix5.m4 index dda4bf45c..43b442758 100644 --- a/contrib/sendmail/cf/ostype/irix5.m4 +++ b/contrib/sendmail/cf/ostype/irix5.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: irix5.m4,v 8.16 1999/04/24 05:37:41 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/irix6.m4 b/contrib/sendmail/cf/ostype/irix6.m4 index 839e3873e..a037b4c42 100644 --- a/contrib/sendmail/cf/ostype/irix6.m4 +++ b/contrib/sendmail/cf/ostype/irix6.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: irix6.m4,v 8.14 1999/08/05 20:35:55 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/isc4.1.m4 b/contrib/sendmail/cf/ostype/isc4.1.m4 index a124643a5..85ef89470 100644 --- a/contrib/sendmail/cf/ostype/isc4.1.m4 +++ b/contrib/sendmail/cf/ostype/isc4.1.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: isc4.1.m4,v 8.16 1999/04/24 05:37:42 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/linux.m4 b/contrib/sendmail/cf/ostype/linux.m4 index b02ad29ee..e836e6caf 100644 --- a/contrib/sendmail/cf/ostype/linux.m4 +++ b/contrib/sendmail/cf/ostype/linux.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: linux.m4,v 8.13 2000/09/17 17:30:00 gshapiro 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')) diff --git a/contrib/sendmail/cf/ostype/maxion.m4 b/contrib/sendmail/cf/ostype/maxion.m4 index 6f9a48ecb..4eea3d412 100644 --- a/contrib/sendmail/cf/ostype/maxion.m4 +++ b/contrib/sendmail/cf/ostype/maxion.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: maxion.m4,v 8.17 1999/10/21 00:31:39 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/mklinux.m4 b/contrib/sendmail/cf/ostype/mklinux.m4 index 90b7d2da3..5ecf1ea5e 100644 --- a/contrib/sendmail/cf/ostype/mklinux.m4 +++ b/contrib/sendmail/cf/ostype/mklinux.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: mklinux.m4,v 8.15 2000/05/09 18:48:56 gshapiro 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')') diff --git a/contrib/sendmail/cf/ostype/mpeix.m4 b/contrib/sendmail/cf/ostype/mpeix.m4 index 9e760e94e..ba9566a71 100644 --- a/contrib/sendmail/cf/ostype/mpeix.m4 +++ b/contrib/sendmail/cf/ostype/mpeix.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: mpeix.m4,v 1.1 2001/12/13 23:56:40 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/nextstep.m4 b/contrib/sendmail/cf/ostype/nextstep.m4 index 0c5289312..e5e211b4f 100644 --- a/contrib/sendmail/cf/ostype/nextstep.m4 +++ b/contrib/sendmail/cf/ostype/nextstep.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: nextstep.m4,v 8.21 1999/10/21 00:31:40 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/openbsd.m4 b/contrib/sendmail/cf/ostype/openbsd.m4 index aaeb615e5..a058c3d61 100644 --- a/contrib/sendmail/cf/ostype/openbsd.m4 +++ b/contrib/sendmail/cf/ostype/openbsd.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: openbsd.m4,v 8.3 1999/04/24 05:37:42 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/osf1.m4 b/contrib/sendmail/cf/ostype/osf1.m4 index dd13963a2..2941648b0 100644 --- a/contrib/sendmail/cf/ostype/osf1.m4 +++ b/contrib/sendmail/cf/ostype/osf1.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: osf1.m4,v 8.16 1999/10/11 18:45:43 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/powerux.m4 b/contrib/sendmail/cf/ostype/powerux.m4 index 4646fe3ee..484a2a830 100644 --- a/contrib/sendmail/cf/ostype/powerux.m4 +++ b/contrib/sendmail/cf/ostype/powerux.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: powerux.m4,v 8.13 1999/04/24 05:37:43 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/ptx2.m4 b/contrib/sendmail/cf/ostype/ptx2.m4 index 84e83963f..054d21adc 100644 --- a/contrib/sendmail/cf/ostype/ptx2.m4 +++ b/contrib/sendmail/cf/ostype/ptx2.m4 @@ -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 @@ divert(-1) # Support for DYNIX/ptx 2.x. divert(0) -VERSIONID(`$Id: ptx2.m4,v 8.17 1999/04/24 05:37:43 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/qnx.m4 b/contrib/sendmail/cf/ostype/qnx.m4 index 5fb3b08e1..972c33acc 100644 --- a/contrib/sendmail/cf/ostype/qnx.m4 +++ b/contrib/sendmail/cf/ostype/qnx.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: qnx.m4,v 8.13 1999/04/24 05:37:43 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/riscos4.5.m4 b/contrib/sendmail/cf/ostype/riscos4.5.m4 index f8069383a..1d09e3796 100644 --- a/contrib/sendmail/cf/ostype/riscos4.5.m4 +++ b/contrib/sendmail/cf/ostype/riscos4.5.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: riscos4.5.m4,v 8.15 1999/04/24 05:37:43 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/sco-uw-2.1.m4 b/contrib/sendmail/cf/ostype/sco-uw-2.1.m4 index 8fe1b84a7..be5bcb94d 100644 --- a/contrib/sendmail/cf/ostype/sco-uw-2.1.m4 +++ b/contrib/sendmail/cf/ostype/sco-uw-2.1.m4 @@ -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 @@ divert(-1) # Contributed by Christopher Durham of SCO. # divert(0) -VERSIONID(`$Id: sco-uw-2.1.m4,v 8.13 1999/04/24 05:37:43 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/sco3.2.m4 b/contrib/sendmail/cf/ostype/sco3.2.m4 index 89ac63765..6e650a720 100644 --- a/contrib/sendmail/cf/ostype/sco3.2.m4 +++ b/contrib/sendmail/cf/ostype/sco3.2.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: sco3.2.m4,v 8.16 1999/04/24 05:37:43 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/sinix.m4 b/contrib/sendmail/cf/ostype/sinix.m4 index bcd6b3182..b10c4d532 100644 --- a/contrib/sendmail/cf/ostype/sinix.m4 +++ b/contrib/sendmail/cf/ostype/sinix.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: sinix.m4,v 8.13 1999/04/24 05:37:43 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/solaris11.m4 b/contrib/sendmail/cf/ostype/solaris11.m4 index a48b0779c..be2517b22 100644 --- a/contrib/sendmail/cf/ostype/solaris11.m4 +++ b/contrib/sendmail/cf/ostype/solaris11.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: solaris11.m4,v 1.1 2011/01/24 21:22:08 ca 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)')') diff --git a/contrib/sendmail/cf/ostype/solaris2.m4 b/contrib/sendmail/cf/ostype/solaris2.m4 index 6cf14846d..d3df61b31 100644 --- a/contrib/sendmail/cf/ostype/solaris2.m4 +++ b/contrib/sendmail/cf/ostype/solaris2.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: solaris2.m4,v 8.22 1999/09/24 21:43:53 ca 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')') diff --git a/contrib/sendmail/cf/ostype/solaris2.ml.m4 b/contrib/sendmail/cf/ostype/solaris2.ml.m4 index 72cb72923..4023898d1 100644 --- a/contrib/sendmail/cf/ostype/solaris2.ml.m4 +++ b/contrib/sendmail/cf/ostype/solaris2.ml.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: solaris2.ml.m4,v 8.14 1999/04/24 05:37:44 gshapiro 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')') diff --git a/contrib/sendmail/cf/ostype/solaris2.pre5.m4 b/contrib/sendmail/cf/ostype/solaris2.pre5.m4 index c30dda60d..2a5007f38 100644 --- a/contrib/sendmail/cf/ostype/solaris2.pre5.m4 +++ b/contrib/sendmail/cf/ostype/solaris2.pre5.m4 @@ -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(-1) divert(0) -VERSIONID(`$Id: solaris2.pre5.m4,v 8.1 1999/09/25 08:17:44 ca Exp $') +VERSIONID(`$Id: solaris2.pre5.m4,v 8.2 2013/11/22 20:51:15 ca Exp $') divert(-1) _DEFIFNOT(`LOCAL_MAILER_FLAGS', `SnE9') diff --git a/contrib/sendmail/cf/ostype/solaris8.m4 b/contrib/sendmail/cf/ostype/solaris8.m4 index 10b9d37bd..33f0af7c3 100644 --- a/contrib/sendmail/cf/ostype/solaris8.m4 +++ b/contrib/sendmail/cf/ostype/solaris8.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: solaris8.m4,v 8.2 2000/08/23 16:10:49 gshapiro 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)')') diff --git a/contrib/sendmail/cf/ostype/sunos3.5.m4 b/contrib/sendmail/cf/ostype/sunos3.5.m4 index d1d776ec3..64455286b 100644 --- a/contrib/sendmail/cf/ostype/sunos3.5.m4 +++ b/contrib/sendmail/cf/ostype/sunos3.5.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: sunos3.5.m4,v 8.10 1999/02/07 07:26:23 gshapiro Exp $') +VERSIONID(`$Id: sunos3.5.m4,v 8.11 2013/11/22 20:51:15 ca Exp $') define(`confEBINDIR', `/usr/lib')dnl diff --git a/contrib/sendmail/cf/ostype/sunos4.1.m4 b/contrib/sendmail/cf/ostype/sunos4.1.m4 index 1e821ffe2..4f2e81630 100644 --- a/contrib/sendmail/cf/ostype/sunos4.1.m4 +++ b/contrib/sendmail/cf/ostype/sunos4.1.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: sunos4.1.m4,v 8.10 1999/02/07 07:26:24 gshapiro Exp $') +VERSIONID(`$Id: sunos4.1.m4,v 8.11 2013/11/22 20:51:15 ca Exp $') define(`confEBINDIR', `/usr/lib')dnl diff --git a/contrib/sendmail/cf/ostype/svr4.m4 b/contrib/sendmail/cf/ostype/svr4.m4 index 3f7706b47..de608ad8f 100644 --- a/contrib/sendmail/cf/ostype/svr4.m4 +++ b/contrib/sendmail/cf/ostype/svr4.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: svr4.m4,v 8.17 1999/10/21 00:31:41 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/ultrix4.m4 b/contrib/sendmail/cf/ostype/ultrix4.m4 index 128c61af3..2a5a0dc09 100644 --- a/contrib/sendmail/cf/ostype/ultrix4.m4 +++ b/contrib/sendmail/cf/ostype/ultrix4.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: ultrix4.m4,v 8.11 1999/02/07 07:26:24 gshapiro Exp $') +VERSIONID(`$Id: ultrix4.m4,v 8.12 2013/11/22 20:51:15 ca Exp $') define(`confEBINDIR', `/usr/lib')dnl diff --git a/contrib/sendmail/cf/ostype/unicos.m4 b/contrib/sendmail/cf/ostype/unicos.m4 index d73f3faae..180857a0c 100644 --- a/contrib/sendmail/cf/ostype/unicos.m4 +++ b/contrib/sendmail/cf/ostype/unicos.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: unicos.m4,v 1.1 2003/04/21 17:03:51 ca 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') diff --git a/contrib/sendmail/cf/ostype/unicosmk.m4 b/contrib/sendmail/cf/ostype/unicosmk.m4 index e9cec04fe..39897e7fe 100644 --- a/contrib/sendmail/cf/ostype/unicosmk.m4 +++ b/contrib/sendmail/cf/ostype/unicosmk.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: unicosmk.m4,v 1.1 2003/04/21 17:03:51 ca 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') diff --git a/contrib/sendmail/cf/ostype/unicosmp.m4 b/contrib/sendmail/cf/ostype/unicosmp.m4 index 79543d2ff..dd7246972 100644 --- a/contrib/sendmail/cf/ostype/unicosmp.m4 +++ b/contrib/sendmail/cf/ostype/unicosmp.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: unicosmp.m4,v 1.1 2003/04/21 17:03:51 ca 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 diff --git a/contrib/sendmail/cf/ostype/unixware7.m4 b/contrib/sendmail/cf/ostype/unixware7.m4 index d42f8aba9..21d5a164d 100644 --- a/contrib/sendmail/cf/ostype/unixware7.m4 +++ b/contrib/sendmail/cf/ostype/unixware7.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: unixware7.m4,v 8.8 2000/02/26 01:32:04 gshapiro 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 diff --git a/contrib/sendmail/cf/ostype/unknown.m4 b/contrib/sendmail/cf/ostype/unknown.m4 index 2d5734ca8..58e10368d 100644 --- a/contrib/sendmail/cf/ostype/unknown.m4 +++ b/contrib/sendmail/cf/ostype/unknown.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: unknown.m4,v 8.9 1999/02/07 07:26:24 gshapiro 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') diff --git a/contrib/sendmail/cf/ostype/uxpds.m4 b/contrib/sendmail/cf/ostype/uxpds.m4 index 1ba0346d3..8cc393a7b 100644 --- a/contrib/sendmail/cf/ostype/uxpds.m4 +++ b/contrib/sendmail/cf/ostype/uxpds.m4 @@ -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(-1) # divert(0) -VERSIONID(`$Id: uxpds.m4,v 8.16 1999/10/21 00:31:42 gshapiro 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 diff --git a/contrib/sendmail/cf/sendmail.schema b/contrib/sendmail/cf/sendmail.schema index fd8c740f2..4c782877a 100644 --- a/contrib/sendmail/cf/sendmail.schema +++ b/contrib/sendmail/cf/sendmail.schema @@ -1,11 +1,11 @@ -# 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 # forth in the LICENSE file which can be found at the top level of # the sendmail distribution. # -# $Id: sendmail.schema,v 8.22 2005/09/16 20:18:14 ca 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 diff --git a/contrib/sendmail/cf/sh/makeinfo.sh b/contrib/sendmail/cf/sh/makeinfo.sh index 1758e99ba..625709e47 100644 --- a/contrib/sendmail/cf/sh/makeinfo.sh +++ b/contrib/sendmail/cf/sh/makeinfo.sh @@ -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 8.14 1999/02/07 07:26:25 gshapiro Exp $ +# $Id: makeinfo.sh,v 8.15 2013/11/22 20:51:17 ca Exp $ # # $FreeBSD$ # diff --git a/contrib/sendmail/contrib/dnsblaccess.m4 b/contrib/sendmail/contrib/dnsblaccess.m4 index e527e28c2..c90fc3b96 100644 --- a/contrib/sendmail/contrib/dnsblaccess.m4 +++ b/contrib/sendmail/contrib/dnsblaccess.m4 @@ -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 ## address returned does not begin 127, then the mail is dnl ## processed as if the HACK line were not present. divert(0) -VERSIONID(`$Id: dnsblaccess.m4,v 1.6 2005/07/25 23:32:05 ca 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') ')') diff --git a/contrib/sendmail/contrib/link_hash.sh b/contrib/sendmail/contrib/link_hash.sh index 843c920d6..a89350c02 100644 --- a/contrib/sendmail/contrib/link_hash.sh +++ b/contrib/sendmail/contrib/link_hash.sh @@ -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.2 2000/04/25 00:12:28 ca Exp $ +## $Id: link_hash.sh,v 1.3 2013/11/22 20:51:18 ca Exp $ ## # # ln a certificate to its hash diff --git a/contrib/sendmail/contrib/qtool.8 b/contrib/sendmail/contrib/qtool.8 index 0a4cbffee..667656924 100644 --- a/contrib/sendmail/contrib/qtool.8 +++ b/contrib/sendmail/contrib/qtool.8 @@ -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 8.20 2004/06/28 17:49:41 ca Exp $ +.\" $Id: qtool.8,v 8.21 2013/11/22 20:51:18 ca Exp $ .\" -.TH QTOOL 8 "$Date: 2004/06/28 17:49:41 $" +.TH QTOOL 8 "$Date: 2013/11/22 20:51:18 $" .SH NAME qtool \- manipulate sendmail queues diff --git a/contrib/sendmail/contrib/qtool.pl b/contrib/sendmail/contrib/qtool.pl index c2a67f83d..647da1a53 100755 --- a/contrib/sendmail/contrib/qtool.pl +++ b/contrib/sendmail/contrib/qtool.pl @@ -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 8.31 2010/11/10 19:11:54 ca Exp $ +## $Id: qtool.pl,v 8.32 2013/11/22 20:51:18 ca Exp $ ## use strict; use File::Basename; diff --git a/contrib/sendmail/doc/op/op.me b/contrib/sendmail/doc/op/op.me index d48cb51a9..ddc6568f7 100644 --- a/contrib/sendmail/doc/op/op.me +++ b/contrib/sendmail/doc/op/op.me @@ -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 8.751 2013/04/08 21:41:25 ca 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 @@ This documentation is under modification. Eric Allman Claus Assmann Gregory Neil Shapiro -Sendmail, Inc. +Proofpoint, Inc. .sp .de Ve Version \\$2 .. -.Ve $Revision: 8.751 $ +.Ve $Revision: 8.759 $ .rm Ve .sp For Sendmail Version 8.14 .)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 @@ mailer which uses the hold mailer flag. .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. @@ -6001,6 +6000,10 @@ or on queue runs 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 @@ -6732,16 +6735,17 @@ STARTTLS is disabled. Possible values are: .(b .ta 1i -5 use 512 bit prime -1 use 1024 bit prime +5 use precomputed 512 bit prime +1 generate 1024 bit prime +2 generate 2048 bit prime none do not use Diffie-Hellman NAME load prime from file .)b This is only required if a ciphersuite containing DSA/DH is used. 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. +If ``1'' or ``2'' is selected, then prime values are computed during startup. +The server side default is ``1''. 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 @@ -10672,6 +10676,16 @@ two (Bourne) shell commands: 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 @@ -11478,7 +11492,7 @@ replace it with a blank sheet for double-sided output. .\".sz 10 .\"Eric Allman .\".sp -.\"Version $Revision: 8.751 $ +.\"Version $Revision: 8.759 $ .\".ce 0 .bp 3 .ce diff --git a/contrib/sendmail/editmap/editmap.8 b/contrib/sendmail/editmap/editmap.8 index 9b0b3ad13..99f8b636a 100644 --- a/contrib/sendmail/editmap/editmap.8 +++ b/contrib/sendmail/editmap/editmap.8 @@ -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.9 2003/02/01 17:07:42 ca Exp $ +.\" $Id: editmap.8,v 1.10 2013/11/22 20:51:26 ca Exp $ .\" -.TH EDITMAP 8 "$Date: 2003/02/01 17:07:42 $" +.TH EDITMAP 8 "$Date: 2013/11/22 20:51:26 $" .SH NAME .B editmap \- query and edit single records in database maps for sendmail diff --git a/contrib/sendmail/editmap/editmap.c b/contrib/sendmail/editmap/editmap.c index 18c352c9b..5e65f40f1 100644 --- a/contrib/sendmail/editmap/editmap.c +++ b/contrib/sendmail/editmap/editmap.c @@ -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 #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 @@ SM_UNUSED(static char copyright[]) = #endif /* ! lint */ #ifndef lint -SM_UNUSED(static char id[]) = "@(#)$Id: editmap.c,v 1.25 2007/05/11 18:50:35 ca Exp $"; +SM_UNUSED(static char id[]) = "@(#)$Id: editmap.c,v 1.26 2013/11/22 20:51:26 ca Exp $"; #endif /* ! lint */ diff --git a/contrib/sendmail/include/libmilter/mfapi.h b/contrib/sendmail/include/libmilter/mfapi.h index 3b8e7d73e..01636047f 100644 --- a/contrib/sendmail/include/libmilter/mfapi.h +++ b/contrib/sendmail/include/libmilter/mfapi.h @@ -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 8.82 2012/11/16 20:25:04 ca Exp $ + * $Id: mfapi.h,v 8.83 2013/11/22 20:51:27 ca Exp $ */ /* diff --git a/contrib/sendmail/include/libmilter/mfdef.h b/contrib/sendmail/include/libmilter/mfdef.h index f42ec026c..52aa025ec 100644 --- a/contrib/sendmail/include/libmilter/mfdef.h +++ b/contrib/sendmail/include/libmilter/mfdef.h @@ -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 8.39 2009/11/06 00:57:08 ca Exp $ + * $Id: mfdef.h,v 8.40 2013/11/22 20:51:27 ca Exp $ */ /* diff --git a/contrib/sendmail/include/libmilter/milter.h b/contrib/sendmail/include/libmilter/milter.h index 061a4dbb8..b73af02b1 100644 --- a/contrib/sendmail/include/libmilter/milter.h +++ b/contrib/sendmail/include/libmilter/milter.h @@ -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 8.41 2006/05/22 23:23:55 ca Exp $ + * $Id: milter.h,v 8.42 2013/11/22 20:51:27 ca Exp $ */ /* diff --git a/contrib/sendmail/include/libsmdb/smdb.h b/contrib/sendmail/include/libsmdb/smdb.h index 6db0103cc..7abbd1245 100644 --- a/contrib/sendmail/include/libsmdb/smdb.h +++ b/contrib/sendmail/include/libsmdb/smdb.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: smdb.h,v 8.41 2002/09/24 19:53:28 ca Exp $ + * $Id: smdb.h,v 8.42 2013/11/22 20:51:28 ca Exp $ * */ diff --git a/contrib/sendmail/include/sendmail/mailstats.h b/contrib/sendmail/include/sendmail/mailstats.h index faa83cb45..9906974d1 100644 --- a/contrib/sendmail/include/sendmail/mailstats.h +++ b/contrib/sendmail/include/sendmail/mailstats.h @@ -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 8.19 2002/06/27 22:47:22 gshapiro Exp $ + * $Id: mailstats.h,v 8.20 2013/11/22 20:51:30 ca Exp $ */ #define STAT_VERSION 4 diff --git a/contrib/sendmail/include/sendmail/pathnames.h b/contrib/sendmail/include/sendmail/pathnames.h index cbf5f4a60..6d637d9f5 100644 --- a/contrib/sendmail/include/sendmail/pathnames.h +++ b/contrib/sendmail/include/sendmail/pathnames.h @@ -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 8.36 2002/04/09 22:40:26 gshapiro Exp $ + * $Id: pathnames.h,v 8.37 2013/11/22 20:51:30 ca Exp $ */ #ifndef SM_PATHNAMES_H diff --git a/contrib/sendmail/include/sendmail/sendmail.h b/contrib/sendmail/include/sendmail/sendmail.h index b12a5a1af..790cc338a 100644 --- a/contrib/sendmail/include/sendmail/sendmail.h +++ b/contrib/sendmail/include/sendmail/sendmail.h @@ -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 8.68 2002/07/01 22:18:53 gshapiro Exp $ + * $Id: sendmail.h,v 8.69 2013/11/22 20:51:30 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/assert.h b/contrib/sendmail/include/sm/assert.h index 6b8653620..4855032a1 100644 --- a/contrib/sendmail/include/sm/assert.h +++ b/contrib/sendmail/include/sm/assert.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: assert.h,v 1.10 2001/06/07 20:04:53 ca Exp $ + * $Id: assert.h,v 1.11 2013/11/22 20:51:31 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/bdb.h b/contrib/sendmail/include/sm/bdb.h index babe1fff9..add683b57 100644 --- a/contrib/sendmail/include/sm/bdb.h +++ b/contrib/sendmail/include/sm/bdb.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2003 Sendmail, Inc. and its suppliers. + * Copyright (c) 2002, 2003 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.4 2003/03/06 16:30:05 ca Exp $ + * $Id: bdb.h,v 1.5 2013/11/22 20:51:31 ca Exp $ */ #ifndef SM_BDB_H diff --git a/contrib/sendmail/include/sm/bitops.h b/contrib/sendmail/include/sm/bitops.h index 44778ba8b..77d987a9f 100644 --- a/contrib/sendmail/include/sm/bitops.h +++ b/contrib/sendmail/include/sm/bitops.h @@ -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.2 2001/09/22 22:05:42 ca Exp $ + * $Id: bitops.h,v 1.3 2013/11/22 20:51:31 ca Exp $ */ #ifndef SM_BITOPS_H diff --git a/contrib/sendmail/include/sm/cdefs.h b/contrib/sendmail/include/sm/cdefs.h index 046ea0492..125c0496c 100644 --- a/contrib/sendmail/include/sm/cdefs.h +++ b/contrib/sendmail/include/sm/cdefs.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: cdefs.h,v 1.16 2003/12/05 22:45:25 ca Exp $ + * $Id: cdefs.h,v 1.17 2013/11/22 20:51:31 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/cf.h b/contrib/sendmail/include/sm/cf.h index 3869210f6..f950b99a5 100644 --- a/contrib/sendmail/include/sm/cf.h +++ b/contrib/sendmail/include/sm/cf.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: cf.h,v 1.2 2001/03/08 03:23:07 ca Exp $ + * $Id: cf.h,v 1.3 2013/11/22 20:51:31 ca Exp $ */ #ifndef SM_CF_H diff --git a/contrib/sendmail/include/sm/clock.h b/contrib/sendmail/include/sm/clock.h index 22ed171b2..8b3636e3a 100644 --- a/contrib/sendmail/include/sm/clock.h +++ b/contrib/sendmail/include/sm/clock.h @@ -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.13 2011/11/03 03:13:24 ca Exp $ + * $Id: clock.h,v 1.14 2013/11/22 20:51:31 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/conf.h b/contrib/sendmail/include/sm/conf.h index b47a5f8cb..179be7aef 100644 --- a/contrib/sendmail/include/sm/conf.h +++ b/contrib/sendmail/include/sm/conf.h @@ -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.144 2011/05/03 16:24:00 ca Exp $ + * $Id: conf.h,v 1.147 2013/11/22 20:51:31 ca Exp $ */ /* @@ -1532,6 +1532,8 @@ extern void *malloc(); # 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 /* IPv6 support */ @@ -2963,6 +2965,11 @@ typedef void (*sigfunc_t) __P((int)); # define SM_INT32 int32_t # endif /* ! SM_INT32 */ +/* XXX 16 bit type */ +# ifndef SM_UINT16 +# define SM_UINT16 uint16_t +# endif /* ! SM_UINT16 */ + /* ** SVr4 and similar systems use different routines for setjmp/longjmp ** with signal support @@ -3045,4 +3052,6 @@ struct sm_align # 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 */ diff --git a/contrib/sendmail/include/sm/config.h b/contrib/sendmail/include/sm/config.h index 045ca8a96..7a7331f22 100644 --- a/contrib/sendmail/include/sm/config.h +++ b/contrib/sendmail/include/sm/config.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: config.h,v 1.48 2013/03/22 22:48:57 gshapiro Exp $ + * $Id: config.h,v 1.49 2013/11/22 20:51:31 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/debug.h b/contrib/sendmail/include/sm/debug.h index e3142b2fa..e67cf47dd 100644 --- a/contrib/sendmail/include/sm/debug.h +++ b/contrib/sendmail/include/sm/debug.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: debug.h,v 1.16 2003/01/10 00:26:06 ca Exp $ + * $Id: debug.h,v 1.17 2013/11/22 20:51:31 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/errstring.h b/contrib/sendmail/include/sm/errstring.h index 1d415260c..952b57da7 100644 --- a/contrib/sendmail/include/sm/errstring.h +++ b/contrib/sendmail/include/sm/errstring.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: errstring.h,v 1.10 2007/03/21 23:56:19 ca Exp $ + * $Id: errstring.h,v 1.11 2013/11/22 20:51:31 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/exc.h b/contrib/sendmail/include/sm/exc.h index afcb1252b..36dde2efe 100644 --- a/contrib/sendmail/include/sm/exc.h +++ b/contrib/sendmail/include/sm/exc.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: exc.h,v 1.23 2001/06/07 20:04:53 ca Exp $ + * $Id: exc.h,v 1.24 2013/11/22 20:51:31 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/fdset.h b/contrib/sendmail/include/sm/fdset.h index bb4218564..69b19e3a4 100644 --- a/contrib/sendmail/include/sm/fdset.h +++ b/contrib/sendmail/include/sm/fdset.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: fdset.h,v 1.5 2002/12/10 19:48:19 ca Exp $ + * $Id: fdset.h,v 1.6 2013/11/22 20:51:31 ca Exp $ */ #ifndef SM_FDSET_H diff --git a/contrib/sendmail/include/sm/gen.h b/contrib/sendmail/include/sm/gen.h index 6fec06c23..4efe452cc 100644 --- a/contrib/sendmail/include/sm/gen.h +++ b/contrib/sendmail/include/sm/gen.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: gen.h,v 1.23 2003/11/04 18:51:54 ca Exp $ + * $Id: gen.h,v 1.24 2013/11/22 20:51:31 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/heap.h b/contrib/sendmail/include/sm/heap.h index cd346b355..ac2c898a7 100644 --- a/contrib/sendmail/include/sm/heap.h +++ b/contrib/sendmail/include/sm/heap.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: heap.h,v 1.23 2006/08/15 00:53:46 ca Exp $ + * $Id: heap.h,v 1.24 2013/11/22 20:51:31 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/io.h b/contrib/sendmail/include/sm/io.h index 5f1b72035..1b5adf65d 100644 --- a/contrib/sendmail/include/sm/io.h +++ b/contrib/sendmail/include/sm/io.h @@ -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.25 2013/03/12 15:24:49 ca Exp $ + * $Id: io.h,v 1.26 2013/11/22 20:51:31 ca Exp $ */ /*- diff --git a/contrib/sendmail/include/sm/ldap.h b/contrib/sendmail/include/sm/ldap.h index b0a9cc058..06f2abdf3 100644 --- a/contrib/sendmail/include/sm/ldap.h +++ b/contrib/sendmail/include/sm/ldap.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: ldap.h,v 1.34 2008/11/17 21:02:54 ca Exp $ + * $Id: ldap.h,v 1.35 2013/11/22 20:51:31 ca Exp $ */ #ifndef SM_LDAP_H diff --git a/contrib/sendmail/include/sm/limits.h b/contrib/sendmail/include/sm/limits.h index 5041db317..c2e2b258a 100644 --- a/contrib/sendmail/include/sm/limits.h +++ b/contrib/sendmail/include/sm/limits.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: limits.h,v 1.6 2001/03/08 03:23:08 ca Exp $ + * $Id: limits.h,v 1.7 2013/11/22 20:51:31 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/mbdb.h b/contrib/sendmail/include/sm/mbdb.h index 010e50c62..e7d0bec78 100644 --- a/contrib/sendmail/include/sm/mbdb.h +++ b/contrib/sendmail/include/sm/mbdb.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: mbdb.h,v 1.6 2002/05/24 20:50:14 gshapiro Exp $ + * $Id: mbdb.h,v 1.7 2013/11/22 20:51:31 ca Exp $ */ #ifndef SM_MBDB_H diff --git a/contrib/sendmail/include/sm/misc.h b/contrib/sendmail/include/sm/misc.h index a9d66379b..259cf2702 100644 --- a/contrib/sendmail/include/sm/misc.h +++ b/contrib/sendmail/include/sm/misc.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: misc.h,v 1.1 2006/06/28 23:57:59 ca Exp $ + * $Id: misc.h,v 1.2 2013/11/22 20:51:31 ca Exp $ */ #ifndef SM_MISC_H diff --git a/contrib/sendmail/include/sm/os/sm_os_aix.h b/contrib/sendmail/include/sm/os/sm_os_aix.h index 4669a3cec..6797a88d5 100644 --- a/contrib/sendmail/include/sm/os/sm_os_aix.h +++ b/contrib/sendmail/include/sm/os/sm_os_aix.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: sm_os_aix.h,v 1.11 2003/04/28 23:42:23 ca Exp $ + * $Id: sm_os_aix.h,v 1.12 2013/11/22 20:51:34 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/os/sm_os_dragonfly.h b/contrib/sendmail/include/sm/os/sm_os_dragonfly.h index 4428cab48..ec8fe4be5 100644 --- a/contrib/sendmail/include/sm/os/sm_os_dragonfly.h +++ b/contrib/sendmail/include/sm/os/sm_os_dragonfly.h @@ -1,12 +1,12 @@ /* - * 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 * 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 2004/08/06 03:54:07 gshapiro Exp $ + * $Id: sm_os_dragonfly.h,v 1.2 2013/11/22 20:51:34 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/os/sm_os_freebsd.h b/contrib/sendmail/include/sm/os/sm_os_freebsd.h index cb4d6f468..bc72c6594 100644 --- a/contrib/sendmail/include/sm/os/sm_os_freebsd.h +++ b/contrib/sendmail/include/sm/os/sm_os_freebsd.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: sm_os_freebsd.h,v 1.11 2002/04/15 17:17:05 gshapiro Exp $ + * $Id: sm_os_freebsd.h,v 1.12 2013/11/22 20:51:34 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/os/sm_os_hp.h b/contrib/sendmail/include/sm/os/sm_os_hp.h index 2cbcb5779..63f491149 100644 --- a/contrib/sendmail/include/sm/os/sm_os_hp.h +++ b/contrib/sendmail/include/sm/os/sm_os_hp.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: sm_os_hp.h,v 1.8 2001/10/31 15:36:56 ca Exp $ + * $Id: sm_os_hp.h,v 1.9 2013/11/22 20:51:34 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/os/sm_os_irix.h b/contrib/sendmail/include/sm/os/sm_os_irix.h index 185485a9e..c3a58da75 100644 --- a/contrib/sendmail/include/sm/os/sm_os_irix.h +++ b/contrib/sendmail/include/sm/os/sm_os_irix.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: sm_os_irix.h,v 1.7 2001/10/09 23:12:13 ca Exp $ + * $Id: sm_os_irix.h,v 1.8 2013/11/22 20:51:34 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/os/sm_os_linux.h b/contrib/sendmail/include/sm/os/sm_os_linux.h index f232c497b..0ad1d9035 100644 --- a/contrib/sendmail/include/sm/os/sm_os_linux.h +++ b/contrib/sendmail/include/sm/os/sm_os_linux.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: sm_os_linux.h,v 1.12 2001/10/05 01:52:41 ca Exp $ + * $Id: sm_os_linux.h,v 1.13 2013/11/22 20:51:34 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/os/sm_os_mpeix.h b/contrib/sendmail/include/sm/os/sm_os_mpeix.h index 385f1f42d..2223e7895 100644 --- a/contrib/sendmail/include/sm/os/sm_os_mpeix.h +++ b/contrib/sendmail/include/sm/os/sm_os_mpeix.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: sm_os_mpeix.h,v 1.2 2001/12/14 00:23:02 ca Exp $ + * $Id: sm_os_mpeix.h,v 1.3 2013/11/22 20:51:34 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/os/sm_os_next.h b/contrib/sendmail/include/sm/os/sm_os_next.h index 03f886ea0..658b03967 100644 --- a/contrib/sendmail/include/sm/os/sm_os_next.h +++ b/contrib/sendmail/include/sm/os/sm_os_next.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: sm_os_next.h,v 1.7 2001/04/03 01:53:06 gshapiro Exp $ + * $Id: sm_os_next.h,v 1.8 2013/11/22 20:51:34 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/os/sm_os_openbsd.h b/contrib/sendmail/include/sm/os/sm_os_openbsd.h index 1acf12d85..1455059a9 100644 --- a/contrib/sendmail/include/sm/os/sm_os_openbsd.h +++ b/contrib/sendmail/include/sm/os/sm_os_openbsd.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: sm_os_openbsd.h,v 1.7 2000/12/05 19:00:47 dmoen Exp $ + * $Id: sm_os_openbsd.h,v 1.8 2013/11/22 20:51:34 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/os/sm_os_openunix.h b/contrib/sendmail/include/sm/os/sm_os_openunix.h index 3e696bafe..070bc91e6 100644 --- a/contrib/sendmail/include/sm/os/sm_os_openunix.h +++ b/contrib/sendmail/include/sm/os/sm_os_openunix.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: sm_os_openunix.h,v 1.5 2001/11/11 16:32:00 ca Exp $ + * $Id: sm_os_openunix.h,v 1.6 2013/11/22 20:51:34 ca Exp $ */ #define SM_OS_NAME "openunix" diff --git a/contrib/sendmail/include/sm/os/sm_os_osf1.h b/contrib/sendmail/include/sm/os/sm_os_osf1.h index eef239cd5..98c154ca4 100644 --- a/contrib/sendmail/include/sm/os/sm_os_osf1.h +++ b/contrib/sendmail/include/sm/os/sm_os_osf1.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: sm_os_osf1.h,v 1.3 2001/10/09 23:12:13 ca Exp $ + * $Id: sm_os_osf1.h,v 1.4 2013/11/22 20:51:34 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/os/sm_os_qnx.h b/contrib/sendmail/include/sm/os/sm_os_qnx.h index 976982768..695cb3c18 100644 --- a/contrib/sendmail/include/sm/os/sm_os_qnx.h +++ b/contrib/sendmail/include/sm/os/sm_os_qnx.h @@ -1,12 +1,12 @@ /* - * 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 * 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 2007/03/21 23:56:20 ca Exp $ + * $Id: sm_os_qnx.h,v 1.2 2013/11/22 20:51:34 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/os/sm_os_sunos.h b/contrib/sendmail/include/sm/os/sm_os_sunos.h index 9d20b18be..3c2d33244 100644 --- a/contrib/sendmail/include/sm/os/sm_os_sunos.h +++ b/contrib/sendmail/include/sm/os/sm_os_sunos.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: sm_os_sunos.h,v 1.14 2001/08/14 18:09:42 ca Exp $ + * $Id: sm_os_sunos.h,v 1.15 2013/11/22 20:51:34 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/os/sm_os_ultrix.h b/contrib/sendmail/include/sm/os/sm_os_ultrix.h index 1ae2db15b..a10e71135 100644 --- a/contrib/sendmail/include/sm/os/sm_os_ultrix.h +++ b/contrib/sendmail/include/sm/os/sm_os_ultrix.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: sm_os_ultrix.h,v 1.3 2001/10/09 23:12:13 ca Exp $ + * $Id: sm_os_ultrix.h,v 1.4 2013/11/22 20:51:34 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/os/sm_os_unicos.h b/contrib/sendmail/include/sm/os/sm_os_unicos.h index 57d6b72f8..f3e1c5639 100644 --- a/contrib/sendmail/include/sm/os/sm_os_unicos.h +++ b/contrib/sendmail/include/sm/os/sm_os_unicos.h @@ -1,12 +1,12 @@ /* - * 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 * 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 2003/04/21 17:03:51 ca Exp $ + * $Id: sm_os_unicos.h,v 1.2 2013/11/22 20:51:34 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/os/sm_os_unicosmk.h b/contrib/sendmail/include/sm/os/sm_os_unicosmk.h index ce87c04e3..c4fcd1acc 100644 --- a/contrib/sendmail/include/sm/os/sm_os_unicosmk.h +++ b/contrib/sendmail/include/sm/os/sm_os_unicosmk.h @@ -1,12 +1,12 @@ /* - * 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 * 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 2003/04/21 17:03:51 ca Exp $ + * $Id: sm_os_unicosmk.h,v 1.2 2013/11/22 20:51:34 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/os/sm_os_unicosmp.h b/contrib/sendmail/include/sm/os/sm_os_unicosmp.h index b11350b78..713564f74 100644 --- a/contrib/sendmail/include/sm/os/sm_os_unicosmp.h +++ b/contrib/sendmail/include/sm/os/sm_os_unicosmp.h @@ -1,12 +1,12 @@ /* - * 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 * 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 2003/04/21 17:03:51 ca Exp $ + * $Id: sm_os_unicosmp.h,v 1.2 2013/11/22 20:51:34 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/os/sm_os_unixware.h b/contrib/sendmail/include/sm/os/sm_os_unixware.h index 6c7bfe62a..a3ade4822 100644 --- a/contrib/sendmail/include/sm/os/sm_os_unixware.h +++ b/contrib/sendmail/include/sm/os/sm_os_unixware.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: sm_os_unixware.h,v 1.8 2002/10/24 18:04:54 ca Exp $ + * $Id: sm_os_unixware.h,v 1.9 2013/11/22 20:51:34 ca Exp $ */ #define SM_OS_NAME "unixware" diff --git a/contrib/sendmail/include/sm/path.h b/contrib/sendmail/include/sm/path.h index 29fc4ca46..105275194 100644 --- a/contrib/sendmail/include/sm/path.h +++ b/contrib/sendmail/include/sm/path.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: path.h,v 1.6 2001/04/03 01:53:00 gshapiro Exp $ + * $Id: path.h,v 1.7 2013/11/22 20:51:31 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/rpool.h b/contrib/sendmail/include/sm/rpool.h index cdff4c774..706ef28ab 100644 --- a/contrib/sendmail/include/sm/rpool.h +++ b/contrib/sendmail/include/sm/rpool.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: rpool.h,v 1.16 2003/09/05 23:07:49 ca Exp $ + * $Id: rpool.h,v 1.17 2013/11/22 20:51:31 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/sem.h b/contrib/sendmail/include/sm/sem.h index 3ac0bc61c..2fc52447d 100644 --- a/contrib/sendmail/include/sm/sem.h +++ b/contrib/sendmail/include/sm/sem.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: sem.h,v 1.10 2008/05/30 16:26:39 ca Exp $ + * $Id: sem.h,v 1.11 2013/11/22 20:51:31 ca Exp $ */ #ifndef SM_SEM_H diff --git a/contrib/sendmail/include/sm/sendmail.h b/contrib/sendmail/include/sm/sendmail.h index 3008934a9..56a247f92 100644 --- a/contrib/sendmail/include/sm/sendmail.h +++ b/contrib/sendmail/include/sm/sendmail.h @@ -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 diff --git a/contrib/sendmail/include/sm/setjmp.h b/contrib/sendmail/include/sm/setjmp.h index 01bda0222..1ba680719 100644 --- a/contrib/sendmail/include/sm/setjmp.h +++ b/contrib/sendmail/include/sm/setjmp.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: setjmp.h,v 1.3 2001/03/08 03:23:08 ca Exp $ + * $Id: setjmp.h,v 1.4 2013/11/22 20:51:31 ca Exp $ */ #ifndef SM_SETJMP_H diff --git a/contrib/sendmail/include/sm/shm.h b/contrib/sendmail/include/sm/shm.h index 61333a20b..18640429c 100644 --- a/contrib/sendmail/include/sm/shm.h +++ b/contrib/sendmail/include/sm/shm.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: shm.h,v 1.11 2005/01/13 22:57:04 ca Exp $ + * $Id: shm.h,v 1.12 2013/11/22 20:51:31 ca Exp $ */ #ifndef SM_SHM_H diff --git a/contrib/sendmail/include/sm/signal.h b/contrib/sendmail/include/sm/signal.h index 3821deb2b..834d77297 100644 --- a/contrib/sendmail/include/sm/signal.h +++ b/contrib/sendmail/include/sm/signal.h @@ -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.16 2001/07/20 19:48:21 gshapiro Exp $ + * $Id: signal.h,v 1.17 2013/11/22 20:51:31 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/string.h b/contrib/sendmail/include/sm/string.h index 7c96b8f6d..0484a5bfa 100644 --- a/contrib/sendmail/include/sm/string.h +++ b/contrib/sendmail/include/sm/string.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: string.h,v 1.38 2003/10/10 17:56:57 ca Exp $ + * $Id: string.h,v 1.39 2013/11/22 20:51:31 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/sysexits.h b/contrib/sendmail/include/sm/sysexits.h index 750def18a..c64e40d18 100644 --- a/contrib/sendmail/include/sm/sysexits.h +++ b/contrib/sendmail/include/sm/sysexits.h @@ -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.5 2001/03/10 17:30:01 ca Exp $ + * $Id: sysexits.h,v 1.6 2013/11/22 20:51:31 ca Exp $ * @(#)sysexits.h 8.1 (Berkeley) 6/2/93 */ diff --git a/contrib/sendmail/include/sm/test.h b/contrib/sendmail/include/sm/test.h index 1d700d7fc..629c110fc 100644 --- a/contrib/sendmail/include/sm/test.h +++ b/contrib/sendmail/include/sm/test.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: test.h,v 1.6 2001/04/03 01:53:01 gshapiro Exp $ + * $Id: test.h,v 1.7 2013/11/22 20:51:32 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/time.h b/contrib/sendmail/include/sm/time.h index 310847c6c..7e185f492 100644 --- a/contrib/sendmail/include/sm/time.h +++ b/contrib/sendmail/include/sm/time.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: time.h,v 1.1 2005/06/14 23:07:19 ca Exp $ + * $Id: time.h,v 1.2 2013/11/22 20:51:32 ca Exp $ */ #ifndef SM_TIME_H diff --git a/contrib/sendmail/include/sm/types.h b/contrib/sendmail/include/sm/types.h index 625a90e7b..3ad9d5f9d 100644 --- a/contrib/sendmail/include/sm/types.h +++ b/contrib/sendmail/include/sm/types.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: types.h,v 1.13 2001/04/03 01:53:01 gshapiro Exp $ + * $Id: types.h,v 1.14 2013/11/22 20:51:32 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/varargs.h b/contrib/sendmail/include/sm/varargs.h index 7746e3a62..02b9dd96a 100644 --- a/contrib/sendmail/include/sm/varargs.h +++ b/contrib/sendmail/include/sm/varargs.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: varargs.h,v 1.8 2002/07/29 21:31:00 gshapiro Exp $ + * $Id: varargs.h,v 1.9 2013/11/22 20:51:32 ca Exp $ */ /* diff --git a/contrib/sendmail/include/sm/xtrap.h b/contrib/sendmail/include/sm/xtrap.h index 2e7e71721..437fce1b0 100644 --- a/contrib/sendmail/include/sm/xtrap.h +++ b/contrib/sendmail/include/sm/xtrap.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: xtrap.h,v 1.7 2001/04/03 01:53:01 gshapiro Exp $ + * $Id: xtrap.h,v 1.8 2013/11/22 20:51:32 ca Exp $ */ /* diff --git a/contrib/sendmail/libmilter/Makefile.m4 b/contrib/sendmail/libmilter/Makefile.m4 index 5b95fbe32..34e5a2acc 100644 --- a/contrib/sendmail/libmilter/Makefile.m4 +++ b/contrib/sendmail/libmilter/Makefile.m4 @@ -1,4 +1,4 @@ -dnl $Id: Makefile.m4,v 8.92 2013/04/16 20:19:54 ca 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 diff --git a/contrib/sendmail/libmilter/comm.c b/contrib/sendmail/libmilter/comm.c index e04681c8d..e115c4625 100644 --- a/contrib/sendmail/libmilter/comm.c +++ b/contrib/sendmail/libmilter/comm.c @@ -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_RCSID("@(#)$Id: comm.c,v 8.70 2009/12/16 16:33:48 ca Exp $") +SM_RCSID("@(#)$Id: comm.c,v 8.71 2013/11/22 20:51:36 ca Exp $") #include "libmilter.h" #include diff --git a/contrib/sendmail/libmilter/docs/api.html b/contrib/sendmail/libmilter/docs/api.html index 3c56746f0..a479eb809 100644 --- a/contrib/sendmail/libmilter/docs/api.html +++ b/contrib/sendmail/libmilter/docs/api.html @@ -2,7 +2,7 @@ Milter API

Milter API

@@ -311,7 +311,7 @@ for a protocol stage.
-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.
By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/design.html b/contrib/sendmail/libmilter/docs/design.html index f2e5f11d8..c0eabdd4b 100644 --- a/contrib/sendmail/libmilter/docs/design.html +++ b/contrib/sendmail/libmilter/docs/design.html @@ -4,7 +4,7 @@

Architecture

@@ -137,7 +137,7 @@ filter process processing messages from two MTAs:
-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 diff --git a/contrib/sendmail/libmilter/docs/index.html b/contrib/sendmail/libmilter/docs/index.html index 517d2f631..5f7295ddf 100644 --- a/contrib/sendmail/libmilter/docs/index.html +++ b/contrib/sendmail/libmilter/docs/index.html @@ -4,7 +4,7 @@

Filtering Mail with Sendmail

@@ -82,7 +82,7 @@ filters and the MTA.
-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 diff --git a/contrib/sendmail/libmilter/docs/installation.html b/contrib/sendmail/libmilter/docs/installation.html index 07142e9c4..7c403976a 100644 --- a/contrib/sendmail/libmilter/docs/installation.html +++ b/contrib/sendmail/libmilter/docs/installation.html @@ -3,7 +3,7 @@

Installation

Contents

@@ -155,7 +155,7 @@ For information about available macros and their meanings, please consult the sendmail documentation.
-Copyright (c) 2000-2003, 2006 Sendmail, Inc. and its suppliers. +Copyright (c) 2000-2003, 2006 Proofpoint, Inc. and its suppliers. All rights reserved.
By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/other.html b/contrib/sendmail/libmilter/docs/other.html index c33b5368d..5f007d9c4 100644 --- a/contrib/sendmail/libmilter/docs/other.html +++ b/contrib/sendmail/libmilter/docs/other.html @@ -3,12 +3,12 @@ FAQ? Mailing list? More sample filters?
-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 diff --git a/contrib/sendmail/libmilter/docs/overview.html b/contrib/sendmail/libmilter/docs/overview.html index d6e3bbaf6..fc95c3312 100644 --- a/contrib/sendmail/libmilter/docs/overview.html +++ b/contrib/sendmail/libmilter/docs/overview.html @@ -4,7 +4,7 @@

Technical Overview

@@ -207,7 +207,7 @@ In the case of Abort the
-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.
By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/sample.html b/contrib/sendmail/libmilter/docs/sample.html index 48e25c597..03c747b16 100644 --- a/contrib/sendmail/libmilter/docs/sample.html +++ b/contrib/sendmail/libmilter/docs/sample.html @@ -2,7 +2,7 @@ A Sample Filter

A Sample Filter

@@ -527,7 +527,7 @@ main(argc, argv)
-Copyright (c) 2000-2004, 2006 Sendmail, Inc. and its suppliers. +Copyright (c) 2000-2004, 2006 Proofpoint, Inc. and its suppliers. All rights reserved.
By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/smfi_addheader.html b/contrib/sendmail/libmilter/docs/smfi_addheader.html index 460b4caf7..4cff97200 100644 --- a/contrib/sendmail/libmilter/docs/smfi_addheader.html +++ b/contrib/sendmail/libmilter/docs/smfi_addheader.html @@ -2,7 +2,7 @@ smfi_addheader

smfi_addheader

@@ -120,7 +120,7 @@ To change a header's current value, use
-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.
By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/smfi_addrcpt.html b/contrib/sendmail/libmilter/docs/smfi_addrcpt.html index cf997e570..e0bb1dba8 100644 --- a/contrib/sendmail/libmilter/docs/smfi_addrcpt.html +++ b/contrib/sendmail/libmilter/docs/smfi_addrcpt.html @@ -2,7 +2,7 @@ smfi_addrcpt

smfi_addrcpt

@@ -73,7 +73,7 @@ in the smfiDesc_str passed to
-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 diff --git a/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html b/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html index 776b02cea..2073c8f37 100644 --- a/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html +++ b/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html @@ -2,7 +2,7 @@ smfi_addrcpt_par

smfi_addrcpt_par

@@ -78,7 +78,7 @@ in the smfiDesc_str passed to
-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 diff --git a/contrib/sendmail/libmilter/docs/smfi_chgfrom.html b/contrib/sendmail/libmilter/docs/smfi_chgfrom.html index e8249e0f0..8f0895510 100644 --- a/contrib/sendmail/libmilter/docs/smfi_chgfrom.html +++ b/contrib/sendmail/libmilter/docs/smfi_chgfrom.html @@ -2,7 +2,7 @@ smfi_chgfrom

smfi_chgfrom

@@ -84,7 +84,7 @@ whether the call was successful.
-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 diff --git a/contrib/sendmail/libmilter/docs/smfi_chgheader.html b/contrib/sendmail/libmilter/docs/smfi_chgheader.html index 517b5ba4c..d04030533 100644 --- a/contrib/sendmail/libmilter/docs/smfi_chgheader.html +++ b/contrib/sendmail/libmilter/docs/smfi_chgheader.html @@ -2,7 +2,7 @@ smfi_chgheader

smfi_chgheader

@@ -115,7 +115,7 @@ Otherwise, it returns MI_SUCCESS.
-Copyright (c) 2000-2003, 2009 Sendmail, Inc. and its suppliers. +Copyright (c) 2000-2003, 2009 Proofpoint, Inc. and its suppliers. All rights reserved.
By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/smfi_delrcpt.html b/contrib/sendmail/libmilter/docs/smfi_delrcpt.html index c43dcd6f4..ff28430a3 100644 --- a/contrib/sendmail/libmilter/docs/smfi_delrcpt.html +++ b/contrib/sendmail/libmilter/docs/smfi_delrcpt.html @@ -2,7 +2,7 @@ smfi_delrcpt

smfi_delrcpt

@@ -72,7 +72,7 @@ The addresses to be removed must match exactly. For example, an address and its
-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 diff --git a/contrib/sendmail/libmilter/docs/smfi_getpriv.html b/contrib/sendmail/libmilter/docs/smfi_getpriv.html index 9584b9ee9..c870b534f 100644 --- a/contrib/sendmail/libmilter/docs/smfi_getpriv.html +++ b/contrib/sendmail/libmilter/docs/smfi_getpriv.html @@ -2,7 +2,7 @@ smfi_getpriv

smfi_getpriv

@@ -52,7 +52,7 @@ Get the connection-specific data pointer for this connection.
-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 diff --git a/contrib/sendmail/libmilter/docs/smfi_getsymval.html b/contrib/sendmail/libmilter/docs/smfi_getsymval.html index 671dbfa57..a92fcdb7f 100644 --- a/contrib/sendmail/libmilter/docs/smfi_getsymval.html +++ b/contrib/sendmail/libmilter/docs/smfi_getsymval.html @@ -2,7 +2,7 @@ smfi_getsymval

smfi_getsymval

@@ -95,7 +95,7 @@ provided with your sendmail distribution.
-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.
By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/smfi_insheader.html b/contrib/sendmail/libmilter/docs/smfi_insheader.html index 5962e61af..36ec0d44b 100644 --- a/contrib/sendmail/libmilter/docs/smfi_insheader.html +++ b/contrib/sendmail/libmilter/docs/smfi_insheader.html @@ -2,7 +2,7 @@ smfi_insheader

smfi_insheader

@@ -140,7 +140,7 @@ Otherwise, it returns MI_SUCCESS.
-Copyright (c) 2004, 2006, 2009 Sendmail, Inc. and its suppliers. +Copyright (c) 2004, 2006, 2009 Proofpoint, Inc. and its suppliers. All rights reserved.
By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/smfi_main.html b/contrib/sendmail/libmilter/docs/smfi_main.html index a74938651..dd7f8f966 100644 --- a/contrib/sendmail/libmilter/docs/smfi_main.html +++ b/contrib/sendmail/libmilter/docs/smfi_main.html @@ -2,7 +2,7 @@ smfi_main

smfi_main

@@ -41,7 +41,7 @@ Hand control to libmilter event loop.
-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 diff --git a/contrib/sendmail/libmilter/docs/smfi_opensocket.html b/contrib/sendmail/libmilter/docs/smfi_opensocket.html index 53ea62b10..a1e9dbf0b 100644 --- a/contrib/sendmail/libmilter/docs/smfi_opensocket.html +++ b/contrib/sendmail/libmilter/docs/smfi_opensocket.html @@ -2,7 +2,7 @@ smfi_opensocket

smfi_opensocket

@@ -74,7 +74,7 @@ Otherwise, it will return MI_SUCCESS
-Copyright (c) 2003, 2008 Sendmail, Inc. and its suppliers. +Copyright (c) 2003, 2008 Proofpoint, Inc. and its suppliers. All rights reserved.
By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/smfi_progress.html b/contrib/sendmail/libmilter/docs/smfi_progress.html index 801bdf335..27423eb46 100644 --- a/contrib/sendmail/libmilter/docs/smfi_progress.html +++ b/contrib/sendmail/libmilter/docs/smfi_progress.html @@ -2,7 +2,7 @@ smfi_progress

smfi_progress

@@ -58,7 +58,7 @@ Otherwise, it will return MI_SUCCESS
-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 diff --git a/contrib/sendmail/libmilter/docs/smfi_quarantine.html b/contrib/sendmail/libmilter/docs/smfi_quarantine.html index 656a480d0..aed22c8ef 100644 --- a/contrib/sendmail/libmilter/docs/smfi_quarantine.html +++ b/contrib/sendmail/libmilter/docs/smfi_quarantine.html @@ -2,7 +2,7 @@ smfi_quarantine

smfi_quarantine

@@ -63,7 +63,7 @@ Otherwise, it will return MI_SUCCESS
-Copyright (c) 2002-2003 Sendmail, Inc. and its suppliers. +Copyright (c) 2002-2003 Proofpoint, Inc. and its suppliers. All rights reserved.
By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/smfi_register.html b/contrib/sendmail/libmilter/docs/smfi_register.html index 1a359188f..083d12264 100644 --- a/contrib/sendmail/libmilter/docs/smfi_register.html +++ b/contrib/sendmail/libmilter/docs/smfi_register.html @@ -2,7 +2,7 @@ smfi_register

smfi_register

@@ -214,7 +214,7 @@ the following values, describing the actions the filter may take:
-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.
By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/smfi_replacebody.html b/contrib/sendmail/libmilter/docs/smfi_replacebody.html index bc8d5ac67..b3c17ccd9 100644 --- a/contrib/sendmail/libmilter/docs/smfi_replacebody.html +++ b/contrib/sendmail/libmilter/docs/smfi_replacebody.html @@ -2,7 +2,7 @@ smfi_replacebody

smfi_replacebody

@@ -83,7 +83,7 @@ Otherwise, it will return MI_SUCCESS.
-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 diff --git a/contrib/sendmail/libmilter/docs/smfi_setbacklog.html b/contrib/sendmail/libmilter/docs/smfi_setbacklog.html index 8353cac26..af52b80fa 100644 --- a/contrib/sendmail/libmilter/docs/smfi_setbacklog.html +++ b/contrib/sendmail/libmilter/docs/smfi_setbacklog.html @@ -2,7 +2,7 @@ smfi_setbacklog

smfi_setbacklog

@@ -54,7 +54,7 @@ to zero.
-Copyright (c) 2002-2003 Sendmail, Inc. and its suppliers. +Copyright (c) 2002-2003 Proofpoint, Inc. and its suppliers. All rights reserved.
By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/smfi_setconn.html b/contrib/sendmail/libmilter/docs/smfi_setconn.html index 70a510e3e..f08b15e5f 100644 --- a/contrib/sendmail/libmilter/docs/smfi_setconn.html +++ b/contrib/sendmail/libmilter/docs/smfi_setconn.html @@ -2,7 +2,7 @@ smfi_setconn

smfi_setconn

@@ -83,7 +83,7 @@ due to a lack of memory.
-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 diff --git a/contrib/sendmail/libmilter/docs/smfi_setdbg.html b/contrib/sendmail/libmilter/docs/smfi_setdbg.html index e001d3f7b..c28468ca7 100644 --- a/contrib/sendmail/libmilter/docs/smfi_setdbg.html +++ b/contrib/sendmail/libmilter/docs/smfi_setdbg.html @@ -2,7 +2,7 @@ smfi_setdbg

smfi_setdbg

@@ -57,7 +57,7 @@ the current, highest, useful value.
-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 diff --git a/contrib/sendmail/libmilter/docs/smfi_setmlreply.html b/contrib/sendmail/libmilter/docs/smfi_setmlreply.html index b01bacf9b..46c04e393 100644 --- a/contrib/sendmail/libmilter/docs/smfi_setmlreply.html +++ b/contrib/sendmail/libmilter/docs/smfi_setmlreply.html @@ -2,7 +2,7 @@ smfi_setmlreply

smfi_setmlreply

@@ -135,7 +135,7 @@ then the SMTP server will terminate the SMTP session with a 421 error code.
-Copyright (c) 2000, 2002-2003 Sendmail, Inc. and its suppliers. +Copyright (c) 2000, 2002-2003 Proofpoint, Inc. and its suppliers. All rights reserved.
By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/smfi_setpriv.html b/contrib/sendmail/libmilter/docs/smfi_setpriv.html index 1c287ebb1..66ddcd86a 100644 --- a/contrib/sendmail/libmilter/docs/smfi_setpriv.html +++ b/contrib/sendmail/libmilter/docs/smfi_setpriv.html @@ -2,7 +2,7 @@ smfi_setpriv

smfi_setpriv

@@ -70,7 +70,7 @@ and set the pointer to NULL.
-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 diff --git a/contrib/sendmail/libmilter/docs/smfi_setreply.html b/contrib/sendmail/libmilter/docs/smfi_setreply.html index d85781599..4db70bbe3 100644 --- a/contrib/sendmail/libmilter/docs/smfi_setreply.html +++ b/contrib/sendmail/libmilter/docs/smfi_setreply.html @@ -2,7 +2,7 @@ smfi_setreply

smfi_setreply

@@ -107,7 +107,7 @@ then the SMTP server will terminate the SMTP session with a 421 error code.
-Copyright (c) 2000, 2002-2003 Sendmail, Inc. and its suppliers. +Copyright (c) 2000, 2002-2003 Proofpoint, Inc. and its suppliers. All rights reserved.
By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/smfi_setsymlist.html b/contrib/sendmail/libmilter/docs/smfi_setsymlist.html index 80793f0b8..c371860e1 100644 --- a/contrib/sendmail/libmilter/docs/smfi_setsymlist.html +++ b/contrib/sendmail/libmilter/docs/smfi_setsymlist.html @@ -2,7 +2,7 @@ smfi_setsymlist

smfi_setsymlist

@@ -99,7 +99,7 @@ the milter.
-Copyright (c) 2006, 2012 Sendmail, Inc. and its suppliers. +Copyright (c) 2006, 2012 Proofpoint, Inc. and its suppliers. All rights reserved.
By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/smfi_settimeout.html b/contrib/sendmail/libmilter/docs/smfi_settimeout.html index 563149977..92382abc5 100644 --- a/contrib/sendmail/libmilter/docs/smfi_settimeout.html +++ b/contrib/sendmail/libmilter/docs/smfi_settimeout.html @@ -2,7 +2,7 @@ smfi_settimeout

smfi_settimeout

@@ -69,7 +69,7 @@ the MTA also uses lower timeouts for communication
-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.
By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/smfi_stop.html b/contrib/sendmail/libmilter/docs/smfi_stop.html index 5d25882d7..e218b5afd 100644 --- a/contrib/sendmail/libmilter/docs/smfi_stop.html +++ b/contrib/sendmail/libmilter/docs/smfi_stop.html @@ -2,7 +2,7 @@ smfi_stop

smfi_stop

@@ -64,7 +64,7 @@ which may then exit or warm-restart.
-Copyright (c) 2003, 2005 Sendmail, Inc. and its suppliers. +Copyright (c) 2003, 2005 Proofpoint, Inc. and its suppliers. All rights reserved.
By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/smfi_version.html b/contrib/sendmail/libmilter/docs/smfi_version.html index 6dd451d15..9b7d325d6 100644 --- a/contrib/sendmail/libmilter/docs/smfi_version.html +++ b/contrib/sendmail/libmilter/docs/smfi_version.html @@ -2,7 +2,7 @@ smfi_version()

smfi_version()

@@ -82,7 +82,7 @@ different patch levels.
-Copyright (c) 2006-2008 Sendmail, Inc. and its suppliers. +Copyright (c) 2006-2008 Proofpoint, Inc. and its suppliers. All rights reserved.
By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/xxfi_abort.html b/contrib/sendmail/libmilter/docs/xxfi_abort.html index 0664dc107..73a170577 100644 --- a/contrib/sendmail/libmilter/docs/xxfi_abort.html +++ b/contrib/sendmail/libmilter/docs/xxfi_abort.html @@ -2,7 +2,7 @@ xxfi_abort

xxfi_abort

@@ -73,7 +73,7 @@ message is later aborted outside its control.
-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 diff --git a/contrib/sendmail/libmilter/docs/xxfi_body.html b/contrib/sendmail/libmilter/docs/xxfi_body.html index 0a5f0f3da..bc19201d3 100644 --- a/contrib/sendmail/libmilter/docs/xxfi_body.html +++ b/contrib/sendmail/libmilter/docs/xxfi_body.html @@ -2,7 +2,7 @@ xxfi_body

xxfi_body

@@ -87,7 +87,7 @@ is available and if so, the milter must request it.
-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 diff --git a/contrib/sendmail/libmilter/docs/xxfi_close.html b/contrib/sendmail/libmilter/docs/xxfi_close.html index 2c2ae778f..2af52f4fe 100644 --- a/contrib/sendmail/libmilter/docs/xxfi_close.html +++ b/contrib/sendmail/libmilter/docs/xxfi_close.html @@ -2,7 +2,7 @@ xxfi_close

xxfi_close

@@ -71,7 +71,7 @@ currently ignored.
-Copyright (c) 2000, 2003, 2004 Sendmail, Inc. and its suppliers. +Copyright (c) 2000, 2003, 2004 Proofpoint, Inc. and its suppliers. All rights reserved.
By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/xxfi_connect.html b/contrib/sendmail/libmilter/docs/xxfi_connect.html index 87d5eeb0b..a3d5ee96d 100644 --- a/contrib/sendmail/libmilter/docs/xxfi_connect.html +++ b/contrib/sendmail/libmilter/docs/xxfi_connect.html @@ -2,7 +2,7 @@ xxfi_connect

xxfi_connect

@@ -111,7 +111,7 @@ routine, this filter's xxfi_connect() will not be called.
-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.
By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/xxfi_data.html b/contrib/sendmail/libmilter/docs/xxfi_data.html index 2633ee5f0..bfd4dbe0b 100644 --- a/contrib/sendmail/libmilter/docs/xxfi_data.html +++ b/contrib/sendmail/libmilter/docs/xxfi_data.html @@ -2,7 +2,7 @@ xxfi_data

xxfi_data

@@ -79,7 +79,7 @@ Handle the DATA command.
-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 diff --git a/contrib/sendmail/libmilter/docs/xxfi_envfrom.html b/contrib/sendmail/libmilter/docs/xxfi_envfrom.html index 6ae88cff6..46ae35eb5 100644 --- a/contrib/sendmail/libmilter/docs/xxfi_envfrom.html +++ b/contrib/sendmail/libmilter/docs/xxfi_envfrom.html @@ -2,7 +2,7 @@ xxfi_envfrom

xxfi_envfrom

@@ -87,7 +87,7 @@ before xxfi_envrcpt.
-Copyright (c) 2000, 2003, 2006 Sendmail, Inc. and its suppliers. +Copyright (c) 2000, 2003, 2006 Proofpoint, Inc. and its suppliers. All rights reserved.
By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html b/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html index 67a8cf54f..d2febbc0c 100644 --- a/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html +++ b/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html @@ -2,7 +2,7 @@ xxfi_envrcpt

xxfi_envrcpt

@@ -88,7 +88,7 @@ Handle the envelope RCPT command.
-Copyright (c) 2000, 2003, 2010 Sendmail, Inc. and its suppliers. +Copyright (c) 2000, 2003, 2010 Proofpoint, Inc. and its suppliers. All rights reserved.
By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/xxfi_eoh.html b/contrib/sendmail/libmilter/docs/xxfi_eoh.html index 2a74e7af5..d06bfdb1e 100644 --- a/contrib/sendmail/libmilter/docs/xxfi_eoh.html +++ b/contrib/sendmail/libmilter/docs/xxfi_eoh.html @@ -2,7 +2,7 @@ xxfi_eoh

xxfi_eoh

@@ -46,7 +46,7 @@ Handle the end of message headers.
-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 diff --git a/contrib/sendmail/libmilter/docs/xxfi_eom.html b/contrib/sendmail/libmilter/docs/xxfi_eom.html index b5aee8b85..ca206ce35 100644 --- a/contrib/sendmail/libmilter/docs/xxfi_eom.html +++ b/contrib/sendmail/libmilter/docs/xxfi_eom.html @@ -2,7 +2,7 @@ xxfi_eom

xxfi_eom

@@ -52,7 +52,7 @@ Modifications are made via the smfi_* routines.
-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 diff --git a/contrib/sendmail/libmilter/docs/xxfi_header.html b/contrib/sendmail/libmilter/docs/xxfi_header.html index 8a5462fc3..001fd7fd8 100644 --- a/contrib/sendmail/libmilter/docs/xxfi_header.html +++ b/contrib/sendmail/libmilter/docs/xxfi_header.html @@ -2,7 +2,7 @@ xxfi_header

xxfi_header

@@ -101,7 +101,7 @@ RFC 2822
-Copyright (c) 2000, 2003, 2006 Sendmail, Inc. and its suppliers. +Copyright (c) 2000, 2003, 2006 Proofpoint, Inc. and its suppliers. All rights reserved.
By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/xxfi_helo.html b/contrib/sendmail/libmilter/docs/xxfi_helo.html index 613cb1949..10dd24b10 100644 --- a/contrib/sendmail/libmilter/docs/xxfi_helo.html +++ b/contrib/sendmail/libmilter/docs/xxfi_helo.html @@ -2,7 +2,7 @@ xxfi_helo

xxfi_helo

@@ -54,7 +54,7 @@ some restrictions can be imposed by the MTA configuration.
-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 diff --git a/contrib/sendmail/libmilter/docs/xxfi_negotiate.html b/contrib/sendmail/libmilter/docs/xxfi_negotiate.html index 0f69f7079..61ea95b3c 100644 --- a/contrib/sendmail/libmilter/docs/xxfi_negotiate.html +++ b/contrib/sendmail/libmilter/docs/xxfi_negotiate.html @@ -2,7 +2,7 @@ xxfi_negotiate

xxfi_negotiate

@@ -267,7 +267,7 @@ should be set to 0 for compatibility with future versions.
-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 diff --git a/contrib/sendmail/libmilter/docs/xxfi_unknown.html b/contrib/sendmail/libmilter/docs/xxfi_unknown.html index 0455dfdfd..f32a5a120 100644 --- a/contrib/sendmail/libmilter/docs/xxfi_unknown.html +++ b/contrib/sendmail/libmilter/docs/xxfi_unknown.html @@ -2,7 +2,7 @@ xxfi_unknown

xxfi_unknown

@@ -74,7 +74,7 @@ it is only possible to return a different error code.
-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 diff --git a/contrib/sendmail/libmilter/engine.c b/contrib/sendmail/libmilter/engine.c index 92c8e6d18..c060cbeb4 100644 --- a/contrib/sendmail/libmilter/engine.c +++ b/contrib/sendmail/libmilter/engine.c @@ -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_RCSID("@(#)$Id: engine.c,v 8.167 2011/03/03 06:09:15 ca Exp $") +SM_RCSID("@(#)$Id: engine.c,v 8.168 2013/11/22 20:51:36 ca Exp $") #include "libmilter.h" diff --git a/contrib/sendmail/libmilter/example.c b/contrib/sendmail/libmilter/example.c index cef4b0f33..754ac0d81 100644 --- a/contrib/sendmail/libmilter/example.c +++ b/contrib/sendmail/libmilter/example.c @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: example.c,v 8.4 2008/07/22 15:12:47 ca Exp $ + * $Id: example.c,v 8.5 2013/11/22 20:51:36 ca Exp $ */ /* diff --git a/contrib/sendmail/libmilter/handler.c b/contrib/sendmail/libmilter/handler.c index 2c34f1f05..6e69179ff 100644 --- a/contrib/sendmail/libmilter/handler.c +++ b/contrib/sendmail/libmilter/handler.c @@ -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,7 +9,7 @@ */ #include -SM_RCSID("@(#)$Id: handler.c,v 8.39 2008/11/25 01:14:16 ca Exp $") +SM_RCSID("@(#)$Id: handler.c,v 8.40 2013/11/22 20:51:36 ca Exp $") #include "libmilter.h" diff --git a/contrib/sendmail/libmilter/libmilter.h b/contrib/sendmail/libmilter/libmilter.h index 5824151da..3ddbbd221 100644 --- a/contrib/sendmail/libmilter/libmilter.h +++ b/contrib/sendmail/libmilter/libmilter.h @@ -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 8.77 2008/11/25 18:28:18 ca 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) diff --git a/contrib/sendmail/libmilter/listener.c b/contrib/sendmail/libmilter/listener.c index 48c552fdd..cd3f6e82b 100644 --- a/contrib/sendmail/libmilter/listener.c +++ b/contrib/sendmail/libmilter/listener.c @@ -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_RCSID("@(#)$Id: listener.c,v 8.126 2009/12/16 16:40:23 ca Exp $") +SM_RCSID("@(#)$Id: listener.c,v 8.127 2013/11/22 20:51:36 ca Exp $") /* ** listener.c -- threaded network listener diff --git a/contrib/sendmail/libmilter/main.c b/contrib/sendmail/libmilter/main.c index d6e727959..0ed4f864b 100644 --- a/contrib/sendmail/libmilter/main.c +++ b/contrib/sendmail/libmilter/main.c @@ -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_RCSID("@(#)$Id: main.c,v 8.84 2008/09/02 05:37:06 ca Exp $") +SM_RCSID("@(#)$Id: main.c,v 8.85 2013/11/22 20:51:36 ca Exp $") #define _DEFINE 1 #include "libmilter.h" diff --git a/contrib/sendmail/libmilter/monitor.c b/contrib/sendmail/libmilter/monitor.c index 366cf7544..ab85a3d81 100644 --- a/contrib/sendmail/libmilter/monitor.c +++ b/contrib/sendmail/libmilter/monitor.c @@ -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_RCSID("@(#)$Id: monitor.c,v 8.7 2007/04/23 16:26:28 ca Exp $") +SM_RCSID("@(#)$Id: monitor.c,v 8.8 2013/11/22 20:51:36 ca Exp $") #include "libmilter.h" #if _FFR_THREAD_MONITOR diff --git a/contrib/sendmail/libmilter/signal.c b/contrib/sendmail/libmilter/signal.c index ad684692e..503ffa697 100644 --- a/contrib/sendmail/libmilter/signal.c +++ b/contrib/sendmail/libmilter/signal.c @@ -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_RCSID("@(#)$Id: signal.c,v 8.44 2006/03/03 03:42:04 ca Exp $") +SM_RCSID("@(#)$Id: signal.c,v 8.45 2013/11/22 20:51:36 ca Exp $") #include "libmilter.h" diff --git a/contrib/sendmail/libmilter/sm_gethost.c b/contrib/sendmail/libmilter/sm_gethost.c index 1bb44053c..346588a8f 100644 --- a/contrib/sendmail/libmilter/sm_gethost.c +++ b/contrib/sendmail/libmilter/sm_gethost.c @@ -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_RCSID("@(#)$Id: sm_gethost.c,v 8.30 2013/02/22 22:43:33 gshapiro Exp $") +SM_RCSID("@(#)$Id: sm_gethost.c,v 8.32 2013/11/22 20:51:36 ca Exp $") #include #if NETINET || NETINET6 @@ -62,7 +62,18 @@ sm_getipnodebyname(name, family, flags, err) 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 @@ mi_gethostbyname(name, family) # 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; } diff --git a/contrib/sendmail/libmilter/smfi.c b/contrib/sendmail/libmilter/smfi.c index 138623e17..cf162db04 100644 --- a/contrib/sendmail/libmilter/smfi.c +++ b/contrib/sendmail/libmilter/smfi.c @@ -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_RCSID("@(#)$Id: smfi.c,v 8.83 2007/04/23 16:44:39 ca Exp $") +SM_RCSID("@(#)$Id: smfi.c,v 8.84 2013/11/22 20:51:36 ca Exp $") #include #include "libmilter.h" diff --git a/contrib/sendmail/libmilter/worker.c b/contrib/sendmail/libmilter/worker.c index 50e810742..5c2ad6b20 100644 --- a/contrib/sendmail/libmilter/worker.c +++ b/contrib/sendmail/libmilter/worker.c @@ -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_RCSID("@(#)$Id: worker.c,v 8.24 2012/03/13 15:37:46 ca Exp $") +SM_RCSID("@(#)$Id: worker.c,v 8.25 2013/11/22 20:51:37 ca Exp $") #include "libmilter.h" diff --git a/contrib/sendmail/libsm/Makefile.m4 b/contrib/sendmail/libsm/Makefile.m4 index 4c7f63703..705b6ac88 100644 --- a/contrib/sendmail/libsm/Makefile.m4 +++ b/contrib/sendmail/libsm/Makefile.m4 @@ -1,4 +1,4 @@ -dnl $Id: Makefile.m4,v 1.73 2013/03/12 15:24:50 ca 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_LIBSM', `true') 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 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 inet6_ntop.c ') bldPRODUCT_END dnl msg.c dnl syslogio.c @@ -31,6 +31,7 @@ smcheck(`t-float', `compile-run') 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') diff --git a/contrib/sendmail/libsm/README b/contrib/sendmail/libsm/README index aff25a1c9..c595f0dee 100644 --- a/contrib/sendmail/libsm/README +++ b/contrib/sendmail/libsm/README @@ -1,11 +1,11 @@ -# 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 # forth in the LICENSE file which can be found at the top level of # the sendmail distribution. # -# $Id: README,v 1.24 2003/12/20 09:23:48 gshapiro Exp $ +# $Id: README,v 1.25 2013/11/22 20:51:42 ca Exp $ # Libsm is a library of generally useful C abstractions. diff --git a/contrib/sendmail/libsm/assert.c b/contrib/sendmail/libsm/assert.c index 7200a0f4c..a2e996355 100644 --- a/contrib/sendmail/libsm/assert.c +++ b/contrib/sendmail/libsm/assert.c @@ -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_RCSID("@(#)$Id: assert.c,v 1.26 2003/12/05 22:45:24 ca Exp $") +SM_RCSID("@(#)$Id: assert.c,v 1.27 2013/11/22 20:51:42 ca Exp $") /* ** Abnormal program termination and assertion checking. diff --git a/contrib/sendmail/libsm/b-strcmp.c b/contrib/sendmail/libsm/b-strcmp.c index c7dcb88b3..f918619c5 100644 --- a/contrib/sendmail/libsm/b-strcmp.c +++ b/contrib/sendmail/libsm/b-strcmp.c @@ -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_RCSID("@(#)$Id: b-strcmp.c,v 1.14 2005/06/14 23:07:20 ca Exp $") +SM_RCSID("@(#)$Id: b-strcmp.c,v 1.15 2013/11/22 20:51:42 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/b-strl.c b/contrib/sendmail/libsm/b-strl.c index e0bc24e74..eb6fb00da 100644 --- a/contrib/sendmail/libsm/b-strl.c +++ b/contrib/sendmail/libsm/b-strl.c @@ -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_RCSID("@(#)$Id: b-strl.c,v 1.25 2005/06/14 23:07:20 ca Exp $") +SM_RCSID("@(#)$Id: b-strl.c,v 1.26 2013/11/22 20:51:42 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/cf.c b/contrib/sendmail/libsm/cf.c index 6501c055c..fe1adf4ba 100644 --- a/contrib/sendmail/libsm/cf.c +++ b/contrib/sendmail/libsm/cf.c @@ -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_RCSID("@(#)$Id: cf.c,v 1.7 2013/03/12 15:24:50 ca Exp $") +SM_RCSID("@(#)$Id: cf.c,v 1.8 2013/11/22 20:51:42 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/clock.c b/contrib/sendmail/libsm/clock.c index 1bdb4fd01..cb53d6372 100644 --- a/contrib/sendmail/libsm/clock.c +++ b/contrib/sendmail/libsm/clock.c @@ -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_RCSID("@(#)$Id: clock.c,v 1.47 2005/06/14 23:07:20 ca Exp $") +SM_RCSID("@(#)$Id: clock.c,v 1.48 2013/11/22 20:51:42 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/clrerr.c b/contrib/sendmail/libsm/clrerr.c index 5b1a8a80a..9d98b1d9b 100644 --- a/contrib/sendmail/libsm/clrerr.c +++ b/contrib/sendmail/libsm/clrerr.c @@ -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_RCSID("@(#)$Id: clrerr.c,v 1.13 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: clrerr.c,v 1.14 2013/11/22 20:51:42 ca Exp $") #include #include #include "local.h" diff --git a/contrib/sendmail/libsm/config.c b/contrib/sendmail/libsm/config.c index c96a7386c..231f9543c 100644 --- a/contrib/sendmail/libsm/config.c +++ b/contrib/sendmail/libsm/config.c @@ -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_RCSID("@(#)$Id: config.c,v 1.31 2007/03/14 21:21:49 ca Exp $") +SM_RCSID("@(#)$Id: config.c,v 1.32 2013/11/22 20:51:42 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/debug.c b/contrib/sendmail/libsm/debug.c index ea9cd846a..219079018 100644 --- a/contrib/sendmail/libsm/debug.c +++ b/contrib/sendmail/libsm/debug.c @@ -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_RCSID("@(#)$Id: debug.c,v 1.32 2009/09/20 05:38:46 ca Exp $") +SM_RCSID("@(#)$Id: debug.c,v 1.33 2013/11/22 20:51:42 ca Exp $") /* ** libsm debugging and tracing diff --git a/contrib/sendmail/libsm/errstring.c b/contrib/sendmail/libsm/errstring.c index b2999bdec..6fc5aeb97 100644 --- a/contrib/sendmail/libsm/errstring.c +++ b/contrib/sendmail/libsm/errstring.c @@ -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_RCSID("@(#)$Id: errstring.c,v 1.19 2003/12/10 03:53:05 gshapiro Exp $") +SM_RCSID("@(#)$Id: errstring.c,v 1.20 2013/11/22 20:51:42 ca Exp $") #include #include /* sys_errlist, on some platforms */ diff --git a/contrib/sendmail/libsm/exc.c b/contrib/sendmail/libsm/exc.c index 0bcf17a68..cbb6a62f5 100644 --- a/contrib/sendmail/libsm/exc.c +++ b/contrib/sendmail/libsm/exc.c @@ -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_RCSID("@(#)$Id: exc.c,v 1.49 2006/12/19 19:28:09 ca Exp $") +SM_RCSID("@(#)$Id: exc.c,v 1.50 2013/11/22 20:51:42 ca Exp $") /* ** exception handling diff --git a/contrib/sendmail/libsm/fclose.c b/contrib/sendmail/libsm/fclose.c index 82a7de468..0e6b4ae67 100644 --- a/contrib/sendmail/libsm/fclose.c +++ b/contrib/sendmail/libsm/fclose.c @@ -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_RCSID("@(#)$Id: fclose.c,v 1.44 2005/06/14 23:07:20 ca Exp $") +SM_RCSID("@(#)$Id: fclose.c,v 1.45 2013/11/22 20:51:42 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/feof.c b/contrib/sendmail/libsm/feof.c index 8d5e0d8fc..4a98eb313 100644 --- a/contrib/sendmail/libsm/feof.c +++ b/contrib/sendmail/libsm/feof.c @@ -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_RCSID("@(#)$Id: feof.c,v 1.13 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: feof.c,v 1.14 2013/11/22 20:51:42 ca Exp $") #include #include #include "local.h" diff --git a/contrib/sendmail/libsm/ferror.c b/contrib/sendmail/libsm/ferror.c index 9487479a2..3a1d51ed1 100644 --- a/contrib/sendmail/libsm/ferror.c +++ b/contrib/sendmail/libsm/ferror.c @@ -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_RCSID("@(#)$Id: ferror.c,v 1.13 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: ferror.c,v 1.14 2013/11/22 20:51:42 ca Exp $") #include #include #include "local.h" diff --git a/contrib/sendmail/libsm/fflush.c b/contrib/sendmail/libsm/fflush.c index 19159e290..a444d0882 100644 --- a/contrib/sendmail/libsm/fflush.c +++ b/contrib/sendmail/libsm/fflush.c @@ -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_RCSID("@(#)$Id: fflush.c,v 1.45 2006/03/03 22:25:00 ca Exp $") +SM_RCSID("@(#)$Id: fflush.c,v 1.46 2013/11/22 20:51:42 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/fget.c b/contrib/sendmail/libsm/fget.c index 01c49da60..132c52491 100644 --- a/contrib/sendmail/libsm/fget.c +++ b/contrib/sendmail/libsm/fget.c @@ -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_RCSID("@(#)$Id: fget.c,v 1.25 2013/03/12 15:24:50 ca Exp $") +SM_RCSID("@(#)$Id: fget.c,v 1.26 2013/11/22 20:51:42 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/findfp.c b/contrib/sendmail/libsm/findfp.c index 1658929ad..24d9d806c 100644 --- a/contrib/sendmail/libsm/findfp.c +++ b/contrib/sendmail/libsm/findfp.c @@ -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_RCSID("@(#)$Id: findfp.c,v 1.67 2006/08/28 21:24:46 ca Exp $") +SM_RCSID("@(#)$Id: findfp.c,v 1.68 2013/11/22 20:51:42 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/flags.c b/contrib/sendmail/libsm/flags.c index 97c38fa5f..cca63166f 100644 --- a/contrib/sendmail/libsm/flags.c +++ b/contrib/sendmail/libsm/flags.c @@ -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_RCSID("@(#)$Id: flags.c,v 1.23 2006/12/19 19:44:23 ca Exp $") +SM_RCSID("@(#)$Id: flags.c,v 1.24 2013/11/22 20:51:42 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/fopen.c b/contrib/sendmail/libsm/fopen.c index f15a15d75..ef53efa60 100644 --- a/contrib/sendmail/libsm/fopen.c +++ b/contrib/sendmail/libsm/fopen.c @@ -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_RCSID("@(#)$Id: fopen.c,v 1.62 2005/06/14 23:07:20 ca Exp $") +SM_RCSID("@(#)$Id: fopen.c,v 1.63 2013/11/22 20:51:42 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/fpos.c b/contrib/sendmail/libsm/fpos.c index 4fe22bf3d..63f24dba0 100644 --- a/contrib/sendmail/libsm/fpos.c +++ b/contrib/sendmail/libsm/fpos.c @@ -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_RCSID("@(#)$Id: fpos.c,v 1.39 2005/06/14 23:07:20 ca Exp $") +SM_RCSID("@(#)$Id: fpos.c,v 1.40 2013/11/22 20:51:42 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/fprintf.c b/contrib/sendmail/libsm/fprintf.c index 71938729c..bcb92b2a3 100644 --- a/contrib/sendmail/libsm/fprintf.c +++ b/contrib/sendmail/libsm/fprintf.c @@ -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_RCSID("@(#)$Id: fprintf.c,v 1.17 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: fprintf.c,v 1.18 2013/11/22 20:51:42 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/fpurge.c b/contrib/sendmail/libsm/fpurge.c index 4e6fd5a10..2d86f2a09 100644 --- a/contrib/sendmail/libsm/fpurge.c +++ b/contrib/sendmail/libsm/fpurge.c @@ -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_RCSID("@(#)$Id: fpurge.c,v 1.20 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: fpurge.c,v 1.21 2013/11/22 20:51:42 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/fput.c b/contrib/sendmail/libsm/fput.c index 3c5e11c7e..764051977 100644 --- a/contrib/sendmail/libsm/fput.c +++ b/contrib/sendmail/libsm/fput.c @@ -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_RCSID("@(#)$Id: fput.c,v 1.20 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: fput.c,v 1.21 2013/11/22 20:51:42 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/fread.c b/contrib/sendmail/libsm/fread.c index 1e651fdc4..bed66bcca 100644 --- a/contrib/sendmail/libsm/fread.c +++ b/contrib/sendmail/libsm/fread.c @@ -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_RCSID("@(#)$Id: fread.c,v 1.28 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: fread.c,v 1.29 2013/11/22 20:51:42 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/fscanf.c b/contrib/sendmail/libsm/fscanf.c index 5e1fcfde7..b7dab1e8e 100644 --- a/contrib/sendmail/libsm/fscanf.c +++ b/contrib/sendmail/libsm/fscanf.c @@ -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_RCSID("@(#)$Id: fscanf.c,v 1.17 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: fscanf.c,v 1.18 2013/11/22 20:51:42 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/fseek.c b/contrib/sendmail/libsm/fseek.c index 4b3fe1036..de58e4e0c 100644 --- a/contrib/sendmail/libsm/fseek.c +++ b/contrib/sendmail/libsm/fseek.c @@ -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_RCSID("@(#)$Id: fseek.c,v 1.47 2005/06/14 23:07:20 ca Exp $") +SM_RCSID("@(#)$Id: fseek.c,v 1.48 2013/11/22 20:51:42 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/fvwrite.c b/contrib/sendmail/libsm/fvwrite.c index a692781ba..485f78ec6 100644 --- a/contrib/sendmail/libsm/fvwrite.c +++ b/contrib/sendmail/libsm/fvwrite.c @@ -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_RCSID("@(#)$Id: fvwrite.c,v 1.49 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: fvwrite.c,v 1.50 2013/11/22 20:51:42 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/fvwrite.h b/contrib/sendmail/libsm/fvwrite.h index a1344c0bf..11814a30b 100644 --- a/contrib/sendmail/libsm/fvwrite.h +++ b/contrib/sendmail/libsm/fvwrite.h @@ -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.7 2001/03/02 00:18:19 ca Exp $ + * $Id: fvwrite.h,v 1.8 2013/11/22 20:51:43 ca Exp $ */ /* I/O descriptors for sm_fvwrite() */ diff --git a/contrib/sendmail/libsm/fwalk.c b/contrib/sendmail/libsm/fwalk.c index b878c1a93..c647223b7 100644 --- a/contrib/sendmail/libsm/fwalk.c +++ b/contrib/sendmail/libsm/fwalk.c @@ -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_RCSID("@(#)$Id: fwalk.c,v 1.21 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: fwalk.c,v 1.22 2013/11/22 20:51:43 ca Exp $") #include #include #include "local.h" diff --git a/contrib/sendmail/libsm/fwrite.c b/contrib/sendmail/libsm/fwrite.c index 372f75dfe..c7d9ad6de 100644 --- a/contrib/sendmail/libsm/fwrite.c +++ b/contrib/sendmail/libsm/fwrite.c @@ -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_RCSID("@(#)$Id: fwrite.c,v 1.24 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: fwrite.c,v 1.25 2013/11/22 20:51:43 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/get.c b/contrib/sendmail/libsm/get.c index 74549fe47..fc58fd16a 100644 --- a/contrib/sendmail/libsm/get.c +++ b/contrib/sendmail/libsm/get.c @@ -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_RCSID("@(#)$Id: get.c,v 1.18 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: get.c,v 1.19 2013/11/22 20:51:43 ca Exp $") #include #include #include "local.h" diff --git a/contrib/sendmail/libsm/glue.h b/contrib/sendmail/libsm/glue.h index db8c1018a..d616f44ca 100644 --- a/contrib/sendmail/libsm/glue.h +++ b/contrib/sendmail/libsm/glue.h @@ -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.6 2001/01/22 23:09:49 ca Exp $ + * $Id: glue.h,v 1.7 2013/11/22 20:51:43 ca Exp $ */ /* diff --git a/contrib/sendmail/libsm/heap.c b/contrib/sendmail/libsm/heap.c index 8ee4396f9..974865a0c 100644 --- a/contrib/sendmail/libsm/heap.c +++ b/contrib/sendmail/libsm/heap.c @@ -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_RCSID("@(#)$Id: heap.c,v 1.51 2004/08/03 20:32:00 ca Exp $") +SM_RCSID("@(#)$Id: heap.c,v 1.52 2013/11/22 20:51:43 ca Exp $") /* ** debugging memory allocation package diff --git a/contrib/sendmail/libsm/inet6_ntop.c b/contrib/sendmail/libsm/inet6_ntop.c new file mode 100644 index 000000000..675f79ee4 --- /dev/null +++ b/contrib/sendmail/libsm/inet6_ntop.c @@ -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_RCSID("@(#)$Id: inet6_ntop.c,v 1.2 2013/11/22 20:51:43 ca Exp $") + +#if NETINET6 +# include +# include +# include +# include +# include + +/* +** 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 */ diff --git a/contrib/sendmail/libsm/ldap.c b/contrib/sendmail/libsm/ldap.c index 9ae233f3c..586149c65 100644 --- a/contrib/sendmail/libsm/ldap.c +++ b/contrib/sendmail/libsm/ldap.c @@ -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_RCSID("@(#)$Id: ldap.c,v 1.85 2011/04/18 22:20:20 ca Exp $") +SM_RCSID("@(#)$Id: ldap.c,v 1.86 2013/11/22 20:51:43 ca Exp $") #if LDAPMAP # include diff --git a/contrib/sendmail/libsm/local.h b/contrib/sendmail/libsm/local.h index b0625a56e..9ce4122c0 100644 --- a/contrib/sendmail/libsm/local.h +++ b/contrib/sendmail/libsm/local.h @@ -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.58 2006/12/19 19:44:23 ca Exp $ + * $Id: local.h,v 1.59 2013/11/22 20:51:43 ca Exp $ */ /* diff --git a/contrib/sendmail/libsm/makebuf.c b/contrib/sendmail/libsm/makebuf.c index 044de8c36..dc778a059 100644 --- a/contrib/sendmail/libsm/makebuf.c +++ b/contrib/sendmail/libsm/makebuf.c @@ -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_RCSID("@(#)$Id: makebuf.c,v 1.26 2001/10/31 16:04:08 ca Exp $") +SM_RCSID("@(#)$Id: makebuf.c,v 1.27 2013/11/22 20:51:43 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/match.c b/contrib/sendmail/libsm/match.c index e42b865a3..6aeb2ef4b 100644 --- a/contrib/sendmail/libsm/match.c +++ b/contrib/sendmail/libsm/match.c @@ -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_RCSID("@(#)$Id: match.c,v 1.10 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: match.c,v 1.11 2013/11/22 20:51:43 ca Exp $") #include diff --git a/contrib/sendmail/libsm/mbdb.c b/contrib/sendmail/libsm/mbdb.c index 3bb514df5..482ed7089 100644 --- a/contrib/sendmail/libsm/mbdb.c +++ b/contrib/sendmail/libsm/mbdb.c @@ -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_RCSID("@(#)$Id: mbdb.c,v 1.41 2009/06/19 22:02:26 guenther Exp $") +SM_RCSID("@(#)$Id: mbdb.c,v 1.43 2014/01/08 17:03:15 ca Exp $") #include @@ -332,23 +332,16 @@ mbdb_pw_lookup(name, user) 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; } diff --git a/contrib/sendmail/libsm/memstat.c b/contrib/sendmail/libsm/memstat.c index 80391d757..b8fe04884 100644 --- a/contrib/sendmail/libsm/memstat.c +++ b/contrib/sendmail/libsm/memstat.c @@ -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_RCSID("@(#)$Id: memstat.c,v 1.6 2007/03/20 23:26:12 ca Exp $") +SM_RCSID("@(#)$Id: memstat.c,v 1.7 2013/11/22 20:51:43 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/mpeix.c b/contrib/sendmail/libsm/mpeix.c index 163dfbac6..f997e8197 100644 --- a/contrib/sendmail/libsm/mpeix.c +++ b/contrib/sendmail/libsm/mpeix.c @@ -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_RCSID("@(#)$Id: mpeix.c,v 1.7 2007/05/11 18:51:22 gshapiro Exp $") +SM_RCSID("@(#)$Id: mpeix.c,v 1.8 2013/11/22 20:51:43 ca Exp $") #ifdef MPE /* diff --git a/contrib/sendmail/libsm/niprop.c b/contrib/sendmail/libsm/niprop.c index ad58867cf..41465cf3f 100644 --- a/contrib/sendmail/libsm/niprop.c +++ b/contrib/sendmail/libsm/niprop.c @@ -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_RCSID("@(#)$Id: niprop.c,v 1.8 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: niprop.c,v 1.9 2013/11/22 20:51:43 ca Exp $") #if NETINFO #include diff --git a/contrib/sendmail/libsm/path.c b/contrib/sendmail/libsm/path.c index 6932e1f29..0e33972d9 100644 --- a/contrib/sendmail/libsm/path.c +++ b/contrib/sendmail/libsm/path.c @@ -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_RCSID("@(#)$Id: path.c,v 1.9 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: path.c,v 1.10 2013/11/22 20:51:43 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/put.c b/contrib/sendmail/libsm/put.c index d513b98b3..05de94a95 100644 --- a/contrib/sendmail/libsm/put.c +++ b/contrib/sendmail/libsm/put.c @@ -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_RCSID("@(#)$Id: put.c,v 1.27 2001/12/19 05:19:35 ca Exp $") +SM_RCSID("@(#)$Id: put.c,v 1.28 2013/11/22 20:51:43 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/refill.c b/contrib/sendmail/libsm/refill.c index eae6ab4a2..43c76f917 100644 --- a/contrib/sendmail/libsm/refill.c +++ b/contrib/sendmail/libsm/refill.c @@ -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_RCSID("@(#)$Id: refill.c,v 1.53 2006/02/28 18:48:25 ca Exp $") +SM_RCSID("@(#)$Id: refill.c,v 1.54 2013/11/22 20:51:43 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/rewind.c b/contrib/sendmail/libsm/rewind.c index 597c6dbc3..9b079b156 100644 --- a/contrib/sendmail/libsm/rewind.c +++ b/contrib/sendmail/libsm/rewind.c @@ -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_RCSID("@(#)$Id: rewind.c,v 1.18 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: rewind.c,v 1.19 2013/11/22 20:51:43 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/rpool.c b/contrib/sendmail/libsm/rpool.c index 39344c268..4c7598e9a 100644 --- a/contrib/sendmail/libsm/rpool.c +++ b/contrib/sendmail/libsm/rpool.c @@ -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_RCSID("@(#)$Id: rpool.c,v 1.28 2004/08/03 20:44:04 ca Exp $") +SM_RCSID("@(#)$Id: rpool.c,v 1.29 2013/11/22 20:51:43 ca Exp $") /* ** resource pools diff --git a/contrib/sendmail/libsm/sem.c b/contrib/sendmail/libsm/sem.c index 83a54e32e..06723c884 100644 --- a/contrib/sendmail/libsm/sem.c +++ b/contrib/sendmail/libsm/sem.c @@ -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_RCSID("@(#)$Id: sem.c,v 1.14 2008/05/30 16:26:38 ca Exp $") +SM_RCSID("@(#)$Id: sem.c,v 1.15 2013/11/22 20:51:43 ca Exp $") #if SM_CONF_SEM # include diff --git a/contrib/sendmail/libsm/setvbuf.c b/contrib/sendmail/libsm/setvbuf.c index 172a767b8..0d8bee926 100644 --- a/contrib/sendmail/libsm/setvbuf.c +++ b/contrib/sendmail/libsm/setvbuf.c @@ -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_RCSID("@(#)$Id: setvbuf.c,v 1.32 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: setvbuf.c,v 1.33 2013/11/22 20:51:43 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/shm.c b/contrib/sendmail/libsm/shm.c index 15c1119ec..c4045bee8 100644 --- a/contrib/sendmail/libsm/shm.c +++ b/contrib/sendmail/libsm/shm.c @@ -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_RCSID("@(#)$Id: shm.c,v 1.19 2005/07/14 22:34:28 ca Exp $") +SM_RCSID("@(#)$Id: shm.c,v 1.20 2013/11/22 20:51:43 ca Exp $") #if SM_CONF_SHM # include diff --git a/contrib/sendmail/libsm/signal.c b/contrib/sendmail/libsm/signal.c index ce2e242fa..b8d6a3433 100644 --- a/contrib/sendmail/libsm/signal.c +++ b/contrib/sendmail/libsm/signal.c @@ -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_RCSID("@(#)$Id: signal.c,v 1.17 2005/06/14 23:07:20 ca Exp $") +SM_RCSID("@(#)$Id: signal.c,v 1.18 2013/11/22 20:51:43 ca Exp $") #if SM_CONF_SETITIMER # include diff --git a/contrib/sendmail/libsm/smstdio.c b/contrib/sendmail/libsm/smstdio.c index 27552e5f5..711609db9 100644 --- a/contrib/sendmail/libsm/smstdio.c +++ b/contrib/sendmail/libsm/smstdio.c @@ -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_IDSTR(id, "@(#)$Id: smstdio.c,v 1.34 2004/08/03 20:46:34 ca Exp $") +SM_IDSTR(id, "@(#)$Id: smstdio.c,v 1.35 2013/11/22 20:51:43 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/snprintf.c b/contrib/sendmail/libsm/snprintf.c index cdb7688a5..ee12d9791 100644 --- a/contrib/sendmail/libsm/snprintf.c +++ b/contrib/sendmail/libsm/snprintf.c @@ -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_RCSID("@(#)$Id: snprintf.c,v 1.24 2006/10/12 21:50:10 ca Exp $") +SM_RCSID("@(#)$Id: snprintf.c,v 1.25 2013/11/22 20:51:43 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/sscanf.c b/contrib/sendmail/libsm/sscanf.c index 168bcfddd..2515d5508 100644 --- a/contrib/sendmail/libsm/sscanf.c +++ b/contrib/sendmail/libsm/sscanf.c @@ -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_RCSID("@(#)$Id: sscanf.c,v 1.25 2002/02/01 02:28:00 ca Exp $") +SM_RCSID("@(#)$Id: sscanf.c,v 1.26 2013/11/22 20:51:43 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/stdio.c b/contrib/sendmail/libsm/stdio.c index 5fe8f225f..974b24276 100644 --- a/contrib/sendmail/libsm/stdio.c +++ b/contrib/sendmail/libsm/stdio.c @@ -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_RCSID("@(#)$Id: stdio.c,v 1.71 2005/06/14 23:07:20 ca Exp $") +SM_RCSID("@(#)$Id: stdio.c,v 1.72 2013/11/22 20:51:43 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/strcasecmp.c b/contrib/sendmail/libsm/strcasecmp.c index 15f5ce8f8..3f1c218c6 100644 --- a/contrib/sendmail/libsm/strcasecmp.c +++ b/contrib/sendmail/libsm/strcasecmp.c @@ -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_RCSID("@(#)$Id: strcasecmp.c,v 1.15 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: strcasecmp.c,v 1.16 2013/11/22 20:51:43 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/strdup.c b/contrib/sendmail/libsm/strdup.c index 7094275e0..e7de0375a 100644 --- a/contrib/sendmail/libsm/strdup.c +++ b/contrib/sendmail/libsm/strdup.c @@ -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_RCSID("@(#)$Id: strdup.c,v 1.15 2003/10/10 17:56:57 ca Exp $") +SM_RCSID("@(#)$Id: strdup.c,v 1.16 2013/11/22 20:51:43 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/strerror.c b/contrib/sendmail/libsm/strerror.c index ffdfb2182..4b9e15fc4 100644 --- a/contrib/sendmail/libsm/strerror.c +++ b/contrib/sendmail/libsm/strerror.c @@ -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_RCSID("@(#)$Id: strerror.c,v 1.23 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: strerror.c,v 1.24 2013/11/22 20:51:43 ca Exp $") /* ** define strerror for platforms that lack it. diff --git a/contrib/sendmail/libsm/strexit.c b/contrib/sendmail/libsm/strexit.c index 0f2cdfc6c..74bac560a 100644 --- a/contrib/sendmail/libsm/strexit.c +++ b/contrib/sendmail/libsm/strexit.c @@ -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_RCSID("@(#)$Id: strexit.c,v 1.5 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: strexit.c,v 1.6 2013/11/22 20:51:43 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/string.c b/contrib/sendmail/libsm/string.c index b0b697569..fe53d2119 100644 --- a/contrib/sendmail/libsm/string.c +++ b/contrib/sendmail/libsm/string.c @@ -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_RCSID("@(#)$Id: string.c,v 1.3 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: string.c,v 1.4 2013/11/22 20:51:43 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/stringf.c b/contrib/sendmail/libsm/stringf.c index b6a7f6635..fa9814b35 100644 --- a/contrib/sendmail/libsm/stringf.c +++ b/contrib/sendmail/libsm/stringf.c @@ -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_RCSID("@(#)$Id: stringf.c,v 1.15 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: stringf.c,v 1.16 2013/11/22 20:51:43 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/strio.c b/contrib/sendmail/libsm/strio.c index 75f376419..4775858bd 100644 --- a/contrib/sendmail/libsm/strio.c +++ b/contrib/sendmail/libsm/strio.c @@ -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_IDSTR(id, "@(#)$Id: strio.c,v 1.44 2005/06/09 21:40:19 ca Exp $") +SM_IDSTR(id, "@(#)$Id: strio.c,v 1.45 2013/11/22 20:51:43 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/strl.c b/contrib/sendmail/libsm/strl.c index ec9a81be2..bcf2382aa 100644 --- a/contrib/sendmail/libsm/strl.c +++ b/contrib/sendmail/libsm/strl.c @@ -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_RCSID("@(#)$Id: strl.c,v 1.31 2002/01/20 01:41:25 gshapiro Exp $") +SM_RCSID("@(#)$Id: strl.c,v 1.32 2013/11/22 20:51:43 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/strrevcmp.c b/contrib/sendmail/libsm/strrevcmp.c index d0ed630ea..9403c89d9 100644 --- a/contrib/sendmail/libsm/strrevcmp.c +++ b/contrib/sendmail/libsm/strrevcmp.c @@ -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_RCSID("@(#)$Id: strrevcmp.c,v 1.5 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: strrevcmp.c,v 1.6 2013/11/22 20:51:43 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/strto.c b/contrib/sendmail/libsm/strto.c index 87e84bfea..a264cbadf 100644 --- a/contrib/sendmail/libsm/strto.c +++ b/contrib/sendmail/libsm/strto.c @@ -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_IDSTR(id, "@(#)$Id: strto.c,v 1.18 2001/12/30 04:59:37 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: strto.c,v 1.19 2013/11/22 20:51:43 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/syslogio.c b/contrib/sendmail/libsm/syslogio.c index 24fa3a23b..02130246d 100644 --- a/contrib/sendmail/libsm/syslogio.c +++ b/contrib/sendmail/libsm/syslogio.c @@ -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_RCSID("@(#)$Id: syslogio.c,v 1.29 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: syslogio.c,v 1.30 2013/11/22 20:51:43 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/t-cf.c b/contrib/sendmail/libsm/t-cf.c index 90785144f..7fa89f906 100644 --- a/contrib/sendmail/libsm/t-cf.c +++ b/contrib/sendmail/libsm/t-cf.c @@ -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_IDSTR(id, "@(#)$Id: t-cf.c,v 1.7 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-cf.c,v 1.8 2013/11/22 20:51:43 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/t-event.c b/contrib/sendmail/libsm/t-event.c index 1096b36a7..611599eee 100644 --- a/contrib/sendmail/libsm/t-event.c +++ b/contrib/sendmail/libsm/t-event.c @@ -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_RCSID("@(#)$Id: t-event.c,v 1.13 2005/06/14 23:07:20 ca Exp $") +SM_RCSID("@(#)$Id: t-event.c,v 1.14 2013/11/22 20:51:43 ca Exp $") #include diff --git a/contrib/sendmail/libsm/t-exc.c b/contrib/sendmail/libsm/t-exc.c index a6922e041..945570352 100644 --- a/contrib/sendmail/libsm/t-exc.c +++ b/contrib/sendmail/libsm/t-exc.c @@ -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_IDSTR(id, "@(#)$Id: t-exc.c,v 1.20 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-exc.c,v 1.21 2013/11/22 20:51:43 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/t-fget.c b/contrib/sendmail/libsm/t-fget.c index 434debf10..ab2145c6e 100644 --- a/contrib/sendmail/libsm/t-fget.c +++ b/contrib/sendmail/libsm/t-fget.c @@ -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_IDSTR(id, "@(#)$Id: t-fget.c,v 1.1 2013/03/12 15:24:50 ca Exp $") +SM_IDSTR(id, "@(#)$Id: t-fget.c,v 1.2 2013/11/22 20:51:43 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/t-float.c b/contrib/sendmail/libsm/t-float.c index f3f059b1a..93f7434cc 100644 --- a/contrib/sendmail/libsm/t-float.c +++ b/contrib/sendmail/libsm/t-float.c @@ -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_IDSTR(id, "@(#)$Id: t-float.c,v 1.18 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-float.c,v 1.19 2013/11/22 20:51:43 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/t-fopen.c b/contrib/sendmail/libsm/t-fopen.c index 2d3839a34..143bb943d 100644 --- a/contrib/sendmail/libsm/t-fopen.c +++ b/contrib/sendmail/libsm/t-fopen.c @@ -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_IDSTR(id, "@(#)$Id: t-fopen.c,v 1.9 2002/02/06 23:57:45 ca Exp $") +SM_IDSTR(id, "@(#)$Id: t-fopen.c,v 1.10 2013/11/22 20:51:43 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/t-heap.c b/contrib/sendmail/libsm/t-heap.c index 7ddb60d2c..605282390 100644 --- a/contrib/sendmail/libsm/t-heap.c +++ b/contrib/sendmail/libsm/t-heap.c @@ -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_IDSTR(id, "@(#)$Id: t-heap.c,v 1.10 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-heap.c,v 1.11 2013/11/22 20:51:43 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/t-inet6_ntop.c b/contrib/sendmail/libsm/t-inet6_ntop.c new file mode 100644 index 000000000..525bbecd0 --- /dev/null +++ b/contrib/sendmail/libsm/t-inet6_ntop.c @@ -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_IDSTR(id, "@(#)$Id: t-inet6_ntop.c,v 1.2 2013/11/22 20:51:43 ca Exp $") + +#include +#if NETINET6 +#include +#include +#include +#include +#include +#include + +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 */ diff --git a/contrib/sendmail/libsm/t-match.c b/contrib/sendmail/libsm/t-match.c index d2776c02a..ec07239a4 100644 --- a/contrib/sendmail/libsm/t-match.c +++ b/contrib/sendmail/libsm/t-match.c @@ -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_IDSTR(id, "@(#)$Id: t-match.c,v 1.9 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-match.c,v 1.10 2013/11/22 20:51:43 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/t-memstat.c b/contrib/sendmail/libsm/t-memstat.c index 3bfe39415..a4622b64b 100644 --- a/contrib/sendmail/libsm/t-memstat.c +++ b/contrib/sendmail/libsm/t-memstat.c @@ -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_IDSTR(id, "@(#)$Id: t-memstat.c,v 1.9 2007/03/14 21:41:09 ca Exp $") +SM_IDSTR(id, "@(#)$Id: t-memstat.c,v 1.11 2013/11/22 20:51:43 ca Exp $") #include @@ -63,6 +63,12 @@ main(argc, argv) case 'r': resource = strdup(optarg); + if (resource == NULL) + { + fprintf(stderr, "strdup(%s) failed\n", + optarg); + exit(1); + } break; case 's': diff --git a/contrib/sendmail/libsm/t-path.c b/contrib/sendmail/libsm/t-path.c index fa6e3453b..1387fc635 100644 --- a/contrib/sendmail/libsm/t-path.c +++ b/contrib/sendmail/libsm/t-path.c @@ -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_IDSTR(id, "@(#)$Id: t-path.c,v 1.8 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-path.c,v 1.9 2013/11/22 20:51:43 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/t-qic.c b/contrib/sendmail/libsm/t-qic.c index 8a8e0c89e..0e62dd443 100644 --- a/contrib/sendmail/libsm/t-qic.c +++ b/contrib/sendmail/libsm/t-qic.c @@ -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_IDSTR(id, "@(#)$Id: t-qic.c,v 1.9 2006/08/24 21:26:13 ca Exp $") +SM_IDSTR(id, "@(#)$Id: t-qic.c,v 1.10 2013/11/22 20:51:43 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/t-rpool.c b/contrib/sendmail/libsm/t-rpool.c index b671a4b4b..6408c1b46 100644 --- a/contrib/sendmail/libsm/t-rpool.c +++ b/contrib/sendmail/libsm/t-rpool.c @@ -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_IDSTR(id, "@(#)$Id: t-rpool.c,v 1.18 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-rpool.c,v 1.19 2013/11/22 20:51:43 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/t-scanf.c b/contrib/sendmail/libsm/t-scanf.c index b3ca0bd8a..e7e980759 100644 --- a/contrib/sendmail/libsm/t-scanf.c +++ b/contrib/sendmail/libsm/t-scanf.c @@ -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_IDSTR(id, "@(#)$Id: t-scanf.c,v 1.5 2001/11/13 00:51:28 ca Exp $") +SM_IDSTR(id, "@(#)$Id: t-scanf.c,v 1.6 2013/11/22 20:51:43 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/t-sem.c b/contrib/sendmail/libsm/t-sem.c index 662b4f6d4..017ba7cdd 100644 --- a/contrib/sendmail/libsm/t-sem.c +++ b/contrib/sendmail/libsm/t-sem.c @@ -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_RCSID("@(#)$Id: t-sem.c,v 1.17 2008/05/30 16:26:38 ca Exp $") +SM_RCSID("@(#)$Id: t-sem.c,v 1.18 2013/11/22 20:51:43 ca Exp $") #include diff --git a/contrib/sendmail/libsm/t-shm.c b/contrib/sendmail/libsm/t-shm.c index ba0bc6c3a..5a81f225c 100644 --- a/contrib/sendmail/libsm/t-shm.c +++ b/contrib/sendmail/libsm/t-shm.c @@ -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_RCSID("@(#)$Id: t-shm.c,v 1.22 2005/01/14 02:14:10 ca Exp $") +SM_RCSID("@(#)$Id: t-shm.c,v 1.23 2013/11/22 20:51:43 ca Exp $") #include diff --git a/contrib/sendmail/libsm/t-smstdio.c b/contrib/sendmail/libsm/t-smstdio.c index 3bad1c1b1..32d770b45 100644 --- a/contrib/sendmail/libsm/t-smstdio.c +++ b/contrib/sendmail/libsm/t-smstdio.c @@ -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_IDSTR(id, "@(#)$Id: t-smstdio.c,v 1.11 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-smstdio.c,v 1.12 2013/11/22 20:51:43 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/t-string.c b/contrib/sendmail/libsm/t-string.c index 0506e7aa4..03e5ca80a 100644 --- a/contrib/sendmail/libsm/t-string.c +++ b/contrib/sendmail/libsm/t-string.c @@ -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_IDSTR(id, "@(#)$Id: t-string.c,v 1.11 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-string.c,v 1.12 2013/11/22 20:51:43 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/t-strio.c b/contrib/sendmail/libsm/t-strio.c index bb18dae68..17cfc7b5d 100644 --- a/contrib/sendmail/libsm/t-strio.c +++ b/contrib/sendmail/libsm/t-strio.c @@ -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_IDSTR(id, "@(#)$Id: t-strio.c,v 1.11 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-strio.c,v 1.12 2013/11/22 20:51:44 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/t-strl.c b/contrib/sendmail/libsm/t-strl.c index 5c118dcbe..24dc8df07 100644 --- a/contrib/sendmail/libsm/t-strl.c +++ b/contrib/sendmail/libsm/t-strl.c @@ -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_IDSTR(id, "@(#)$Id: t-strl.c,v 1.15 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-strl.c,v 1.16 2013/11/22 20:51:44 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/t-strrevcmp.c b/contrib/sendmail/libsm/t-strrevcmp.c index fb8fb467d..a4031be42 100644 --- a/contrib/sendmail/libsm/t-strrevcmp.c +++ b/contrib/sendmail/libsm/t-strrevcmp.c @@ -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_IDSTR(id, "@(#)$Id: t-strrevcmp.c,v 1.3 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-strrevcmp.c,v 1.4 2013/11/22 20:51:44 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/t-types.c b/contrib/sendmail/libsm/t-types.c index cb07f6757..aed1e93d7 100644 --- a/contrib/sendmail/libsm/t-types.c +++ b/contrib/sendmail/libsm/t-types.c @@ -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_IDSTR(id, "@(#)$Id: t-types.c,v 1.18 2002/03/13 17:29:53 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-types.c,v 1.19 2013/11/22 20:51:44 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/test.c b/contrib/sendmail/libsm/test.c index 361cc4557..117e89bb5 100644 --- a/contrib/sendmail/libsm/test.c +++ b/contrib/sendmail/libsm/test.c @@ -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_IDSTR(Id, "@(#)$Id: test.c,v 1.16 2002/01/08 17:54:40 ca Exp $") +SM_IDSTR(Id, "@(#)$Id: test.c,v 1.17 2013/11/22 20:51:44 ca Exp $") /* ** Abstractions for writing libsm test programs. diff --git a/contrib/sendmail/libsm/ungetc.c b/contrib/sendmail/libsm/ungetc.c index 2f90e1490..36d62e68f 100644 --- a/contrib/sendmail/libsm/ungetc.c +++ b/contrib/sendmail/libsm/ungetc.c @@ -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_IDSTR(id, "@(#)$Id: ungetc.c,v 1.30 2005/06/14 23:07:20 ca Exp $") +SM_IDSTR(id, "@(#)$Id: ungetc.c,v 1.31 2013/11/22 20:51:44 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/util.c b/contrib/sendmail/libsm/util.c index 2b99a4934..7a600ae25 100644 --- a/contrib/sendmail/libsm/util.c +++ b/contrib/sendmail/libsm/util.c @@ -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_RCSID("@(#)$Id: util.c,v 1.9 2006/08/30 18:35:51 ca Exp $") +SM_RCSID("@(#)$Id: util.c,v 1.10 2013/11/22 20:51:44 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/vasprintf.c b/contrib/sendmail/libsm/vasprintf.c index 69d857633..7507656f7 100644 --- a/contrib/sendmail/libsm/vasprintf.c +++ b/contrib/sendmail/libsm/vasprintf.c @@ -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_RCSID("@(#)$Id: vasprintf.c,v 1.27 2003/06/03 02:14:24 ca Exp $") +SM_RCSID("@(#)$Id: vasprintf.c,v 1.28 2013/11/22 20:51:44 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/vfprintf.c b/contrib/sendmail/libsm/vfprintf.c index c4ca9bb28..fcc18a10c 100644 --- a/contrib/sendmail/libsm/vfprintf.c +++ b/contrib/sendmail/libsm/vfprintf.c @@ -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_IDSTR(id, "@(#)$Id: vfprintf.c,v 1.54 2005/05/16 03:52:00 ca Exp $") +SM_IDSTR(id, "@(#)$Id: vfprintf.c,v 1.55 2013/11/22 20:51:44 ca Exp $") /* ** Overall: diff --git a/contrib/sendmail/libsm/vfscanf.c b/contrib/sendmail/libsm/vfscanf.c index 8701ef7bf..a2b871a60 100644 --- a/contrib/sendmail/libsm/vfscanf.c +++ b/contrib/sendmail/libsm/vfscanf.c @@ -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_IDSTR(id, "@(#)$Id: vfscanf.c,v 1.54 2006/10/12 22:03:52 ca Exp $") +SM_IDSTR(id, "@(#)$Id: vfscanf.c,v 1.55 2013/11/22 20:51:44 ca Exp $") #include #include diff --git a/contrib/sendmail/libsm/vprintf.c b/contrib/sendmail/libsm/vprintf.c index 6e310efa6..4061a6690 100644 --- a/contrib/sendmail/libsm/vprintf.c +++ b/contrib/sendmail/libsm/vprintf.c @@ -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_RCSID("@(#)$Id: vprintf.c,v 1.14 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: vprintf.c,v 1.15 2013/11/22 20:51:44 ca Exp $") #include #include "local.h" diff --git a/contrib/sendmail/libsm/vsnprintf.c b/contrib/sendmail/libsm/vsnprintf.c index 18a46358b..15abcbacd 100644 --- a/contrib/sendmail/libsm/vsnprintf.c +++ b/contrib/sendmail/libsm/vsnprintf.c @@ -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_RCSID("@(#)$Id: vsnprintf.c,v 1.23 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: vsnprintf.c,v 1.24 2013/11/22 20:51:44 ca Exp $") #include #include #include "local.h" diff --git a/contrib/sendmail/libsm/wbuf.c b/contrib/sendmail/libsm/wbuf.c index 83855351c..b52e97e0c 100644 --- a/contrib/sendmail/libsm/wbuf.c +++ b/contrib/sendmail/libsm/wbuf.c @@ -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_RCSID("@(#)$Id: wbuf.c,v 1.21 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: wbuf.c,v 1.22 2013/11/22 20:51:44 ca Exp $") #include #include #include "local.h" diff --git a/contrib/sendmail/libsm/wsetup.c b/contrib/sendmail/libsm/wsetup.c index 400553e17..1d8b48f30 100644 --- a/contrib/sendmail/libsm/wsetup.c +++ b/contrib/sendmail/libsm/wsetup.c @@ -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_RCSID("@(#)$Id: wsetup.c,v 1.20 2002/02/07 18:02:45 ca Exp $") +SM_RCSID("@(#)$Id: wsetup.c,v 1.21 2013/11/22 20:51:44 ca Exp $") #include #include #include diff --git a/contrib/sendmail/libsm/xtrap.c b/contrib/sendmail/libsm/xtrap.c index 7495e0994..c25450bf7 100644 --- a/contrib/sendmail/libsm/xtrap.c +++ b/contrib/sendmail/libsm/xtrap.c @@ -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_RCSID("@(#)$Id: xtrap.c,v 1.5 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: xtrap.c,v 1.6 2013/11/22 20:51:44 ca Exp $") #include diff --git a/contrib/sendmail/libsmdb/smdb.c b/contrib/sendmail/libsmdb/smdb.c index 6eb403302..8442246fe 100644 --- a/contrib/sendmail/libsmdb/smdb.c +++ b/contrib/sendmail/libsmdb/smdb.c @@ -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_RCSID("@(#)$Id: smdb.c,v 8.58 2004/08/03 20:58:38 ca Exp $") +SM_RCSID("@(#)$Id: smdb.c,v 8.59 2013/11/22 20:51:49 ca Exp $") #include #include diff --git a/contrib/sendmail/libsmdb/smdb1.c b/contrib/sendmail/libsmdb/smdb1.c index 842d4b2ec..2bd9ce0fd 100644 --- a/contrib/sendmail/libsmdb/smdb1.c +++ b/contrib/sendmail/libsmdb/smdb1.c @@ -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_RCSID("@(#)$Id: smdb1.c,v 8.62 2009/11/12 23:04:18 ca Exp $") +SM_RCSID("@(#)$Id: smdb1.c,v 8.63 2013/11/22 20:51:49 ca Exp $") #include #include diff --git a/contrib/sendmail/libsmdb/smdb2.c b/contrib/sendmail/libsmdb/smdb2.c index 15806619e..12e4192fb 100644 --- a/contrib/sendmail/libsmdb/smdb2.c +++ b/contrib/sendmail/libsmdb/smdb2.c @@ -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_RCSID("@(#)$Id: smdb2.c,v 8.80 2009/11/12 23:07:49 ca Exp $") +SM_RCSID("@(#)$Id: smdb2.c,v 8.83 2013/11/22 20:51:49 ca Exp $") #include #include @@ -625,6 +625,8 @@ smdb_db_open(database, db_name, mode, mode_mask, sff, type, user_info, db_params { smdb_unlock_file(lock_fd); smdb_free_database(smdb_db); /* ok to be NULL */ + if (db2 != NULL) + free(db2); return SMDBE_MALLOC; } diff --git a/contrib/sendmail/libsmdb/smndbm.c b/contrib/sendmail/libsmdb/smndbm.c index 89ecf631a..4ea6e5818 100644 --- a/contrib/sendmail/libsmdb/smndbm.c +++ b/contrib/sendmail/libsmdb/smndbm.c @@ -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_RCSID("@(#)$Id: smndbm.c,v 8.52 2002/05/21 22:30:30 gshapiro Exp $") +SM_RCSID("@(#)$Id: smndbm.c,v 8.55 2013/11/22 20:51:49 ca Exp $") #include #include @@ -438,13 +438,18 @@ smdbm_cursor(database, cursor, flags) 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; 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; diff --git a/contrib/sendmail/libsmutil/cf.c b/contrib/sendmail/libsmutil/cf.c index f313762f5..7048c837f 100644 --- a/contrib/sendmail/libsmutil/cf.c +++ b/contrib/sendmail/libsmutil/cf.c @@ -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_RCSID("@(#)$Id: cf.c,v 8.19 2002/09/24 20:40:59 ca Exp $") +SM_RCSID("@(#)$Id: cf.c,v 8.20 2013/11/22 20:51:50 ca Exp $") #include /* diff --git a/contrib/sendmail/libsmutil/debug.c b/contrib/sendmail/libsmutil/debug.c index 2c3b3284a..91db5960e 100644 --- a/contrib/sendmail/libsmutil/debug.c +++ b/contrib/sendmail/libsmutil/debug.c @@ -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 -SM_RCSID("@(#)$Id: debug.c,v 8.9 2001/09/11 04:04:55 gshapiro Exp $") +SM_RCSID("@(#)$Id: debug.c,v 8.10 2013/11/22 20:51:50 ca Exp $") unsigned char tTdvect[100]; /* trace vector */ diff --git a/contrib/sendmail/libsmutil/err.c b/contrib/sendmail/libsmutil/err.c index 0ad52a4a4..92c5a8f31 100644 --- a/contrib/sendmail/libsmutil/err.c +++ b/contrib/sendmail/libsmutil/err.c @@ -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 -SM_RCSID("@(#)$Id: err.c,v 8.5 2001/09/11 04:04:55 gshapiro Exp $") +SM_RCSID("@(#)$Id: err.c,v 8.6 2013/11/22 20:51:50 ca Exp $") #include diff --git a/contrib/sendmail/libsmutil/lockfile.c b/contrib/sendmail/libsmutil/lockfile.c index 17d6237ea..ae4020c06 100644 --- a/contrib/sendmail/libsmutil/lockfile.c +++ b/contrib/sendmail/libsmutil/lockfile.c @@ -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 -SM_RCSID("@(#)$Id: lockfile.c,v 8.21 2003/11/10 22:57:38 ca Exp $") +SM_RCSID("@(#)$Id: lockfile.c,v 8.22 2013/11/22 20:51:50 ca Exp $") /* diff --git a/contrib/sendmail/libsmutil/safefile.c b/contrib/sendmail/libsmutil/safefile.c index f299e1053..cd1d1ed7e 100644 --- a/contrib/sendmail/libsmutil/safefile.c +++ b/contrib/sendmail/libsmutil/safefile.c @@ -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 #include -SM_RCSID("@(#)$Id: safefile.c,v 8.129 2008/08/04 18:07:04 gshapiro Exp $") +SM_RCSID("@(#)$Id: safefile.c,v 8.130 2013/11/22 20:51:50 ca Exp $") /* diff --git a/contrib/sendmail/libsmutil/snprintf.c b/contrib/sendmail/libsmutil/snprintf.c index ff3aa3b90..4e347a79e 100644 --- a/contrib/sendmail/libsmutil/snprintf.c +++ b/contrib/sendmail/libsmutil/snprintf.c @@ -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 -SM_RCSID("@(#)$Id: snprintf.c,v 8.44 2001/09/11 04:04:56 gshapiro Exp $") +SM_RCSID("@(#)$Id: snprintf.c,v 8.45 2013/11/22 20:51:50 ca Exp $") /* ** SHORTENSTRING -- return short version of a string diff --git a/contrib/sendmail/mail.local/mail.local.8 b/contrib/sendmail/mail.local/mail.local.8 index 7811451c5..8c7f49d96 100644 --- a/contrib/sendmail/mail.local/mail.local.8 +++ b/contrib/sendmail/mail.local/mail.local.8 @@ -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 8.25 2003/10/20 20:26:51 ca Exp $ +.\" $Id: mail.local.8,v 8.26 2013/11/22 20:51:51 ca Exp $ .\" -.TH MAIL.LOCAL 8 "$Date: 2003/10/20 20:26:51 $" +.TH MAIL.LOCAL 8 "$Date: 2013/11/22 20:51:51 $" .SH NAME mail.local \- store mail in a mailbox diff --git a/contrib/sendmail/mail.local/mail.local.c b/contrib/sendmail/mail.local/mail.local.c index e20d91588..617eefc1d 100644 --- a/contrib/sendmail/mail.local/mail.local.c +++ b/contrib/sendmail/mail.local/mail.local.c @@ -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. @@ -15,12 +15,12 @@ #include 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 8.256 2008/02/19 07:13:30 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: mail.local.c,v 8.257 2013/11/22 20:51:51 ca Exp $") #include #include diff --git a/contrib/sendmail/mailstats/mailstats.8 b/contrib/sendmail/mailstats/mailstats.8 index d6c25def5..4a4b02090 100644 --- a/contrib/sendmail/mailstats/mailstats.8 +++ b/contrib/sendmail/mailstats/mailstats.8 @@ -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 8.31 2002/06/27 22:47:29 gshapiro Exp $ +.\" $Id: mailstats.8,v 8.32 2013/11/22 20:51:51 ca Exp $ .\" -.TH MAILSTATS 8 "$Date: 2002/06/27 22:47:29 $" +.TH MAILSTATS 8 "$Date: 2013/11/22 20:51:51 $" .SH NAME mailstats \- display mail statistics diff --git a/contrib/sendmail/mailstats/mailstats.c b/contrib/sendmail/mailstats/mailstats.c index 739f57e39..b82039543 100644 --- a/contrib/sendmail/mailstats/mailstats.c +++ b/contrib/sendmail/mailstats/mailstats.c @@ -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_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 8.102 2013/03/12 15:24:50 ca Exp $") +SM_IDSTR(id, "@(#)$Id: mailstats.c,v 8.103 2013/11/22 20:51:51 ca Exp $") #include #include diff --git a/contrib/sendmail/makemap/makemap.8 b/contrib/sendmail/makemap/makemap.8 index ca8a949de..60352b037 100644 --- a/contrib/sendmail/makemap/makemap.8 +++ b/contrib/sendmail/makemap/makemap.8 @@ -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 8.31 2008/05/02 23:07:48 ca Exp $ +.\" $Id: makemap.8,v 8.32 2013/11/22 20:51:52 ca Exp $ .\" -.TH MAKEMAP 8 "$Date: 2008/05/02 23:07:48 $" +.TH MAKEMAP 8 "$Date: 2013/11/22 20:51:52 $" .SH NAME makemap \- create database maps for sendmail diff --git a/contrib/sendmail/makemap/makemap.c b/contrib/sendmail/makemap/makemap.c index f494ba03e..ae8774584 100644 --- a/contrib/sendmail/makemap/makemap.c +++ b/contrib/sendmail/makemap/makemap.c @@ -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_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 8.181 2013/03/12 15:24:51 ca Exp $") +SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.183 2013/11/22 20:51:52 ca Exp $") #include @@ -234,67 +234,71 @@ main(argc, argv) } #if HASFCHOWN - /* Find TrustedUser value in sendmail.cf */ - if ((cfp = sm_io_open(SmFtStdio, SM_TIME_DEFAULT, cfile, SM_IO_RDONLY, - NULL)) == NULL) + if (!unmake && geteuid() == 0) { - sm_io_fprintf(smioerr, SM_TIME_DEFAULT, "makemap: %s: %s\n", - cfile, sm_errstring(errno)); - exit(EX_NOINPUT); - } - while (sm_io_fgets(cfp, SM_TIME_DEFAULT, buf, sizeof(buf)) >= 0) - { - register char *b; + /* Find TrustedUser value in sendmail.cf */ + if ((cfp = sm_io_open(SmFtStdio, SM_TIME_DEFAULT, cfile, + SM_IO_RDONLY, NULL)) == NULL) + { + sm_io_fprintf(smioerr, SM_TIME_DEFAULT, + "makemap: %s: %s\n", + cfile, sm_errstring(errno)); + exit(EX_NOINPUT); + } + while (sm_io_fgets(cfp, SM_TIME_DEFAULT, buf, sizeof(buf)) >= 0) + { + register char *b; - if ((b = strchr(buf, '\n')) != NULL) - *b = '\0'; + if ((b = strchr(buf, '\n')) != NULL) + *b = '\0'; - b = buf; - switch (*b++) - { - case 'O': /* option */ - if (strncasecmp(b, " TrustedUser", 12) == 0 && - !(isascii(b[12]) && isalnum(b[12]))) + b = buf; + switch (*b++) { - b = strchr(b, '='); - if (b == NULL) - continue; - while (isascii(*++b) && isspace(*b)) - continue; - if (isascii(*b) && isdigit(*b)) - TrustedUid = atoi(b); - else + case 'O': /* option */ + if (strncasecmp(b, " TrustedUser", 12) == 0 && + !(isascii(b[12]) && isalnum(b[12]))) { - TrustedUid = 0; - pw = getpwnam(b); - if (pw == NULL) - (void) sm_io_fprintf(smioerr, - SM_TIME_DEFAULT, - "TrustedUser: unknown user %s\n", b); + b = strchr(b, '='); + if (b == NULL) + continue; + while (isascii(*++b) && isspace(*b)) + continue; + if (isascii(*b) && isdigit(*b)) + TrustedUid = atoi(b); else - TrustedUid = pw->pw_uid; - } + { + TrustedUid = 0; + pw = getpwnam(b); + if (pw == NULL) + (void) sm_io_fprintf(smioerr, + SM_TIME_DEFAULT, + "TrustedUser: unknown user %s\n", b); + else + TrustedUid = pw->pw_uid; + } # ifdef UID_MAX - if (TrustedUid > UID_MAX) - { - (void) sm_io_fprintf(smioerr, - SM_TIME_DEFAULT, - "TrustedUser: uid value (%ld) > UID_MAX (%ld)", - (long) TrustedUid, - (long) UID_MAX); - TrustedUid = 0; - } + if (TrustedUid > UID_MAX) + { + (void) sm_io_fprintf(smioerr, + SM_TIME_DEFAULT, + "TrustedUser: uid value (%ld) > UID_MAX (%ld)", + (long) TrustedUid, + (long) UID_MAX); + TrustedUid = 0; + } # endif /* UID_MAX */ - break; - } + break; + } - default: - continue; + default: + continue; + } } + (void) sm_io_close(cfp, SM_TIME_DEFAULT); } - (void) sm_io_close(cfp, SM_TIME_DEFAULT); #endif /* HASFCHOWN */ if (!params.smdbp_allow_dup && !allowreplace) diff --git a/contrib/sendmail/praliases/praliases.8 b/contrib/sendmail/praliases/praliases.8 index 1f11014f4..e263fcf21 100644 --- a/contrib/sendmail/praliases/praliases.8 +++ b/contrib/sendmail/praliases/praliases.8 @@ -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 8.19 2008/07/10 20:13:10 ca Exp $ +.\" $Id: praliases.8,v 8.20 2013/11/22 20:51:53 ca Exp $ .\" -.TH PRALIASES 8 "$Date: 2008/07/10 20:13:10 $" +.TH PRALIASES 8 "$Date: 2013/11/22 20:51:53 $" .SH NAME praliases \- display system mail aliases diff --git a/contrib/sendmail/praliases/praliases.c b/contrib/sendmail/praliases/praliases.c index 04ad9f4fa..4a7ea50ec 100644 --- a/contrib/sendmail/praliases/praliases.c +++ b/contrib/sendmail/praliases/praliases.c @@ -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_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 8.97 2013/03/12 15:24:51 ca Exp $") +SM_IDSTR(id, "@(#)$Id: praliases.c,v 8.98 2013/11/22 20:51:53 ca Exp $") #include #include diff --git a/contrib/sendmail/rmail/rmail.8 b/contrib/sendmail/rmail/rmail.8 index 41aa3394f..a243e639c 100644 --- a/contrib/sendmail/rmail/rmail.8 +++ b/contrib/sendmail/rmail/rmail.8 @@ -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 8.4 2001/04/03 01:53:16 gshapiro Exp $ +.\" $Id: rmail.8,v 8.5 2013/11/22 20:51:53 ca Exp $ .\" -.TH RMAIL 8 "$Date: 2001/04/03 01:53:16 $" +.TH RMAIL 8 "$Date: 2013/11/22 20:51:53 $" .SH NAME rmail \- handle remote mail received via uucp diff --git a/contrib/sendmail/rmail/rmail.c b/contrib/sendmail/rmail/rmail.c index bb1508e6e..357ed73bb 100644 --- a/contrib/sendmail/rmail/rmail.c +++ b/contrib/sendmail/rmail/rmail.c @@ -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. @@ -15,12 +15,12 @@ #include 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 8.62 2013/03/12 15:24:52 ca Exp $") +SM_IDSTR(id, "@(#)$Id: rmail.c,v 8.63 2013/11/22 20:51:53 ca Exp $") /* * RMAIL -- UUCP mail server. diff --git a/contrib/sendmail/smrsh/smrsh.8 b/contrib/sendmail/smrsh/smrsh.8 index f0ed01c0a..d461591a3 100644 --- a/contrib/sendmail/smrsh/smrsh.8 +++ b/contrib/sendmail/smrsh/smrsh.8 @@ -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 8.22 2004/08/06 03:55:35 gshapiro Exp $ +.\" $Id: smrsh.8,v 8.23 2013/11/22 20:52:00 ca Exp $ .\" -.TH SMRSH 8 "$Date: 2004/08/06 03:55:35 $" +.TH SMRSH 8 "$Date: 2013/11/22 20:52:00 $" .SH NAME smrsh \- restricted shell for sendmail .SH SYNOPSIS diff --git a/contrib/sendmail/smrsh/smrsh.c b/contrib/sendmail/smrsh/smrsh.c index 284ffef77..a70e32d78 100644 --- a/contrib/sendmail/smrsh/smrsh.c +++ b/contrib/sendmail/smrsh/smrsh.c @@ -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_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 8.65 2004/08/06 18:54:22 ca Exp $") +SM_IDSTR(id, "@(#)$Id: smrsh.c,v 8.66 2013/11/22 20:52:00 ca Exp $") /* ** SMRSH -- sendmail restricted shell diff --git a/contrib/sendmail/src/Makefile.m4 b/contrib/sendmail/src/Makefile.m4 index a29c18e4d..dd04b2b3b 100644 --- a/contrib/sendmail/src/Makefile.m4 +++ b/contrib/sendmail/src/Makefile.m4 @@ -1,4 +1,4 @@ -dnl $Id: Makefile.m4,v 8.139 2013/04/17 17:15:54 ca 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') diff --git a/contrib/sendmail/src/README b/contrib/sendmail/src/README index 9c4628ffe..18bffcb27 100644 --- a/contrib/sendmail/src/README +++ b/contrib/sendmail/src/README @@ -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 8.392 2009/04/10 17:49:19 gshapiro 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 @@ For detailed instructions, please read the document ../doc/op/op.me: 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. @@ -1848,4 +1848,4 @@ util.c Some general purpose routines used by sendmail. version.c The version number and information about this version of sendmail. -(Version $Revision: 8.392 $, last update $Date: 2009/04/10 17:49:19 $ ) +(Version $Revision: 8.393 $, last update $Date: 2013/11/22 20:51:54 $ ) diff --git a/contrib/sendmail/src/SECURITY b/contrib/sendmail/src/SECURITY index 0445e4452..9f3cf5896 100644 --- a/contrib/sendmail/src/SECURITY +++ b/contrib/sendmail/src/SECURITY @@ -1,11 +1,11 @@ -# 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 # forth in the LICENSE file which can be found at the top level of # the sendmail distribution. # -# $Id: SECURITY,v 1.51 2002/09/23 21:29:18 ca 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 diff --git a/contrib/sendmail/src/TRACEFLAGS b/contrib/sendmail/src/TRACEFLAGS index c3f026626..0ebe8b2c2 100644 --- a/contrib/sendmail/src/TRACEFLAGS +++ b/contrib/sendmail/src/TRACEFLAGS @@ -1,4 +1,4 @@ -# $Id: TRACEFLAGS,v 8.52 2012/03/03 00:10:42 ca 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 @@ -98,7 +98,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) diff --git a/contrib/sendmail/src/TUNING b/contrib/sendmail/src/TUNING index fe9e6947a..c42f3219b 100644 --- a/contrib/sendmail/src/TUNING +++ b/contrib/sendmail/src/TUNING @@ -1,11 +1,11 @@ -# Copyright (c) 2001-2003 Sendmail, Inc. and its suppliers. +# Copyright (c) 2001-2003 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: TUNING,v 1.21 2006/09/25 16:45:05 ca Exp $ +# $Id: TUNING,v 1.22 2013/11/22 20:51:54 ca Exp $ # ******************************************** diff --git a/contrib/sendmail/src/alias.c b/contrib/sendmail/src/alias.c index 57d0b0811..c1b85cf9f 100644 --- a/contrib/sendmail/src/alias.c +++ b/contrib/sendmail/src/alias.c @@ -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 -SM_RCSID("@(#)$Id: alias.c,v 8.220 2013/03/12 15:24:52 ca Exp $") +SM_RCSID("@(#)$Id: alias.c,v 8.221 2013/11/22 20:51:54 ca Exp $") #define SEPARATOR ':' # define ALIAS_SPEC_SEPARATORS " ,/:" diff --git a/contrib/sendmail/src/aliases.5 b/contrib/sendmail/src/aliases.5 index 32fb50c4f..6715b516d 100644 --- a/contrib/sendmail/src/aliases.5 +++ b/contrib/sendmail/src/aliases.5 @@ -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 8.19 2004/07/12 05:39:21 ca Exp $ +.\" $Id: aliases.5,v 8.20 2013/11/22 20:51:55 ca Exp $ .\" -.TH ALIASES 5 "$Date: 2004/07/12 05:39:21 $" +.TH ALIASES 5 "$Date: 2013/11/22 20:51:55 $" .SH NAME aliases \- aliases file for sendmail diff --git a/contrib/sendmail/src/arpadate.c b/contrib/sendmail/src/arpadate.c index 5d3d7a6d3..e3e771a27 100644 --- a/contrib/sendmail/src/arpadate.c +++ b/contrib/sendmail/src/arpadate.c @@ -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 -SM_RCSID("@(#)$Id: arpadate.c,v 8.31 2006/08/15 23:24:55 ca Exp $") +SM_RCSID("@(#)$Id: arpadate.c,v 8.32 2013/11/22 20:51:55 ca Exp $") /* ** ARPADATE -- Create date in ARPANET format diff --git a/contrib/sendmail/src/bf.c b/contrib/sendmail/src/bf.c index b31ce7e8b..e4725b733 100644 --- a/contrib/sendmail/src/bf.c +++ b/contrib/sendmail/src/bf.c @@ -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_RCSID("@(#)$Id: bf.c,v 8.62 2006/03/31 18:45:56 ca Exp $") +SM_RCSID("@(#)$Id: bf.c,v 8.63 2013/11/22 20:51:55 ca Exp $") #include #include diff --git a/contrib/sendmail/src/bf.h b/contrib/sendmail/src/bf.h index 5a02292c1..eb0101f88 100644 --- a/contrib/sendmail/src/bf.h +++ b/contrib/sendmail/src/bf.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: bf.h,v 8.16 2002/04/15 02:37:09 ca Exp $ + * $Id: bf.h,v 8.17 2013/11/22 20:51:55 ca Exp $ * * Contributed by Exactis.com, Inc. * diff --git a/contrib/sendmail/src/collect.c b/contrib/sendmail/src/collect.c index 1b7b5f5fd..8af4d4e6c 100644 --- a/contrib/sendmail/src/collect.c +++ b/contrib/sendmail/src/collect.c @@ -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 -SM_RCSID("@(#)$Id: collect.c,v 8.286 2013/03/15 17:54:12 ca 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 *)); diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c index edfa0c2bf..7c0ea394a 100644 --- a/contrib/sendmail/src/conf.c +++ b/contrib/sendmail/src/conf.c @@ -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 -SM_RCSID("@(#)$Id: conf.c,v 8.1182 2013/04/05 17:39:09 ca Exp $") +SM_RCSID("@(#)$Id: conf.c,v 8.1191 2014/01/08 17:03:14 ca Exp $") #include #include @@ -665,6 +665,13 @@ setupmaps() dequote_init, null_map_open, null_map_close, arith_map_lookup, null_map_store); +#if _FFR_ARPA_MAP + /* "arpa" map -- IP -> arpa */ + MAPDEF("arpa", NULL, 0, + dequote_init, null_map_open, null_map_close, + arpa_map_lookup, null_map_store); +#endif /* _FFR_ARPA_MAP */ + #if SOCKETMAP /* arbitrary daemons */ MAPDEF("socket", NULL, MCF_ALIASOK, @@ -4221,8 +4228,16 @@ sm_getipnodebyname(name, family, flags, err) 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) { @@ -4234,8 +4249,20 @@ sm_getipnodebyname(name, family, flags, err) 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 +4390,17 @@ sm_gethostbyname(name, family) } } #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 +4410,12 @@ sm_gethostbyname(name, family) 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 +4426,23 @@ sm_gethostbyname(name, family) { 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); } @@ -6095,6 +6139,10 @@ char *FFRCompileOptions[] = /* DefaultAuthInfo doesn't really work in 8.13 anymore. */ "_FFR_ALLOW_SASLINFO", #endif /* _FFR_ALLOW_SASLINFO */ +#if _FFR_ARPA_MAP + /* arpa map to reverse an IPv(4,6) address */ + "_FFR_ARPA_MAP", +#endif /* _FFR_ARPA_MAP */ #if _FFR_BADRCPT_SHUTDOWN /* shut down connection (421) if there are too many bad RCPTs */ "_FFR_BADRCPT_SHUTDOWN", @@ -6251,6 +6299,10 @@ char *FFRCompileOptions[] = /* Ignore extensions offered in response to HELO */ "_FFR_IGNORE_EXT_ON_HELO", #endif /* _FFR_IGNORE_EXT_ON_HELO */ +#if _FFR_IPV6_FULL + /* Use uncompressed IPv6 address format (no "::") */ + "_FFR_IPV6_FULL", +#endif /* _FFR_IPV6_FULL */ #if _FFR_LINUX_MHNL /* Set MAXHOSTNAMELEN to 256 (Linux) */ "_FFR_LINUX_MHNL", @@ -6472,6 +6524,9 @@ char *FFRCompileOptions[] = /* More STARTTLS options, e.g., secondary certs. */ "_FFR_TLS_1", #endif /* _FFR_TLS_1 */ +#if _FFR_TLS_EC + "_FFR_TLS_EC", +#endif /* _FFR_TLS_EC */ #if _FFR_TRUSTED_QF /* ** If we don't own the file mark it as unsafe. @@ -6481,6 +6536,16 @@ char *FFRCompileOptions[] = "_FFR_TRUSTED_QF", #endif /* _FFR_TRUSTED_QF */ +#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 include/sm/os/*.h. + */ + + "_FFR_USE_GETPWNAM_ERRNO", +#endif /* _FFR_USE_GETPWNAM_ERRNO */ #if _FFR_USE_SEM_LOCKING "_FFR_USE_SEM_LOCKING", #endif /* _FFR_USE_SEM_LOCKING */ diff --git a/contrib/sendmail/src/conf.h b/contrib/sendmail/src/conf.h index dff37ff99..d9162de25 100644 --- a/contrib/sendmail/src/conf.h +++ b/contrib/sendmail/src/conf.h @@ -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 8.575 2009/03/25 20:04:00 ca Exp $ + * $Id: conf.h,v 8.577 2013/11/22 20:51:55 ca Exp $ */ /* @@ -112,7 +112,9 @@ struct rusage; /* forward declaration to get gcc to shut up in wait.h */ #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 */ diff --git a/contrib/sendmail/src/control.c b/contrib/sendmail/src/control.c index 4d1074092..25ad91c12 100644 --- a/contrib/sendmail/src/control.c +++ b/contrib/sendmail/src/control.c @@ -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 -SM_RCSID("@(#)$Id: control.c,v 8.129 2013/03/12 15:24:52 ca Exp $") +SM_RCSID("@(#)$Id: control.c,v 8.130 2013/11/22 20:51:55 ca Exp $") #include diff --git a/contrib/sendmail/src/convtime.c b/contrib/sendmail/src/convtime.c index 36edc1a0b..e1b953563 100644 --- a/contrib/sendmail/src/convtime.c +++ b/contrib/sendmail/src/convtime.c @@ -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 -SM_RCSID("@(#)$Id: convtime.c,v 8.39 2001/09/11 04:05:13 gshapiro Exp $") +SM_RCSID("@(#)$Id: convtime.c,v 8.40 2013/11/22 20:51:55 ca Exp $") /* ** CONVTIME -- convert time diff --git a/contrib/sendmail/src/daemon.c b/contrib/sendmail/src/daemon.c index 498f8c211..e0521016f 100644 --- a/contrib/sendmail/src/daemon.c +++ b/contrib/sendmail/src/daemon.c @@ -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 #include "map.h" -SM_RCSID("@(#)$Id: daemon.c,v 8.694 2012/03/03 00:10:42 ca 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 @@ -2352,11 +2352,11 @@ gothostent: /* 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. */ @@ -4259,7 +4259,11 @@ anynet_ntop(s6a, dst, dst_len) return NULL; dst += sz; dst_len -= sz; +# if _FFR_IPV6_FULL + ap = sm_inet6_ntop(s6a, dst, dst_len); +# else /* _FFR_IPV6_FULL */ ap = (char *) inet_ntop(AF_INET6, s6a, dst, dst_len); +# endif /* _FFR_IPV6_FULL */ /* Restore pointer to beginning of string */ if (ap != NULL) diff --git a/contrib/sendmail/src/daemon.h b/contrib/sendmail/src/daemon.h index d8fa29169..d78658069 100644 --- a/contrib/sendmail/src/daemon.h +++ b/contrib/sendmail/src/daemon.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: daemon.h,v 8.3 2006/07/13 22:57:03 ca Exp $ + * $Id: daemon.h,v 8.4 2013/11/22 20:51:55 ca Exp $ */ #ifndef DAEMON_H diff --git a/contrib/sendmail/src/deliver.c b/contrib/sendmail/src/deliver.c index e941334fc..d28fdd4db 100644 --- a/contrib/sendmail/src/deliver.c +++ b/contrib/sendmail/src/deliver.c @@ -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 #include -SM_RCSID("@(#)$Id: deliver.c,v 8.1028 2013/01/02 18:57:42 ca Exp $") +SM_RCSID("@(#)$Id: deliver.c,v 8.1030 2013/11/22 20:51:55 ca Exp $") #if HASSETUSERCONTEXT # include diff --git a/contrib/sendmail/src/domain.c b/contrib/sendmail/src/domain.c index 21442b379..fbd5c445f 100644 --- a/contrib/sendmail/src/domain.c +++ b/contrib/sendmail/src/domain.c @@ -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 8.204 2010/06/29 15:35:33 ca 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 8.204 2010/06/29 15:35:33 ca 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 diff --git a/contrib/sendmail/src/envelope.c b/contrib/sendmail/src/envelope.c index 18defd2ef..249728969 100644 --- a/contrib/sendmail/src/envelope.c +++ b/contrib/sendmail/src/envelope.c @@ -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 -SM_RCSID("@(#)$Id: envelope.c,v 8.312 2010/02/03 16:36:40 ca 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 diff --git a/contrib/sendmail/src/err.c b/contrib/sendmail/src/err.c index baa355a59..357222d1a 100644 --- a/contrib/sendmail/src/err.c +++ b/contrib/sendmail/src/err.c @@ -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 -SM_RCSID("@(#)$Id: err.c,v 8.205 2010/02/03 23:22:41 ca Exp $") +SM_RCSID("@(#)$Id: err.c,v 8.206 2013/11/22 20:51:55 ca Exp $") #if LDAPMAP # include diff --git a/contrib/sendmail/src/headers.c b/contrib/sendmail/src/headers.c index 02f9663dd..7b390a8ad 100644 --- a/contrib/sendmail/src/headers.c +++ b/contrib/sendmail/src/headers.c @@ -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 #include -SM_RCSID("@(#)$Id: headers.c,v 8.318 2012/06/14 23:54:02 ca 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 *)); @@ -377,17 +377,18 @@ hse: 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) && (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 @@ hse: { /* 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; diff --git a/contrib/sendmail/src/helpfile b/contrib/sendmail/src/helpfile index 941dc2a16..0ce4c871a 100644 --- a/contrib/sendmail/src/helpfile +++ b/contrib/sendmail/src/helpfile @@ -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 By using this file, you agree to the terms and conditions set cpyr forth in the LICENSE file which can be found at the top level of cpyr the sendmail distribution. cpyr -cpyr $$Id: helpfile,v 8.48 2007/02/01 18:29:44 ca Exp $$ +cpyr $$Id: helpfile,v 8.49 2013/11/22 20:51:55 ca Exp $$ cpyr smtp This is sendmail version $v smtp Topics: diff --git a/contrib/sendmail/src/macro.c b/contrib/sendmail/src/macro.c index cdde4d249..d18d5c7cf 100644 --- a/contrib/sendmail/src/macro.c +++ b/contrib/sendmail/src/macro.c @@ -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 -SM_RCSID("@(#)$Id: macro.c,v 8.107 2007/08/06 22:29:02 ca Exp $") +SM_RCSID("@(#)$Id: macro.c,v 8.108 2013/11/22 20:51:55 ca Exp $") #include #if MAXMACROID != (BITMAPBITS - 1) diff --git a/contrib/sendmail/src/mailq.1 b/contrib/sendmail/src/mailq.1 index 62f123c7d..ec0cb210e 100644 --- a/contrib/sendmail/src/mailq.1 +++ b/contrib/sendmail/src/mailq.1 @@ -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 8.21 2007/03/22 18:21:27 ca Exp $ +.\" $Id: mailq.1,v 8.22 2013/11/22 20:51:55 ca Exp $ .\" -.TH MAILQ 1 "$Date: 2007/03/22 18:21:27 $" +.TH MAILQ 1 "$Date: 2013/11/22 20:51:55 $" .SH NAME mailq \- print the mail queue diff --git a/contrib/sendmail/src/main.c b/contrib/sendmail/src/main.c index 021262c5b..08e715a5d 100644 --- a/contrib/sendmail/src/main.c +++ b/contrib/sendmail/src/main.c @@ -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,14 +19,14 @@ #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\ The Regents of the University of California. All rights reserved.\n"; #endif /* ! lint */ -SM_RCSID("@(#)$Id: main.c,v 8.983 2013/03/12 15:24:52 ca Exp $") +SM_RCSID("@(#)$Id: main.c,v 8.988 2013/11/23 02:52:37 gshapiro Exp $") #if NETINET || NETINET6 @@ -77,17 +77,19 @@ static SIGFUNC_DECL sigusr1 __P((int)); ** (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. ** ** 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 */ @@ -4484,6 +4486,25 @@ testmodeline(line, e) (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, diff --git a/contrib/sendmail/src/map.c b/contrib/sendmail/src/map.c index ad7d8185b..24ed1f1b0 100644 --- a/contrib/sendmail/src/map.c +++ b/contrib/sendmail/src/map.c @@ -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 -SM_RCSID("@(#)$Id: map.c,v 8.711 2013/03/12 15:24:52 ca Exp $") +SM_RCSID("@(#)$Id: map.c,v 8.713 2013/11/22 20:51:55 ca Exp $") #if LDAPMAP # include @@ -7366,6 +7366,87 @@ arith_map_lookup(map, name, av, statp) return NULL; } +#if _FFR_ARPA_MAP +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 = anynet_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; +} +#endif /* _FFR_ARPA_MAP */ + #if SOCKETMAP # if NETINET || NETINET6 diff --git a/contrib/sendmail/src/map.h b/contrib/sendmail/src/map.h index dda99992b..f4198c0f5 100644 --- a/contrib/sendmail/src/map.h +++ b/contrib/sendmail/src/map.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: map.h,v 8.3 2006/12/19 19:49:51 ca Exp $ + * $Id: map.h,v 8.4 2013/11/22 20:51:56 ca Exp $ */ #ifndef _MAP_H diff --git a/contrib/sendmail/src/mci.c b/contrib/sendmail/src/mci.c index 6e635a8e2..860dce829 100644 --- a/contrib/sendmail/src/mci.c +++ b/contrib/sendmail/src/mci.c @@ -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 -SM_RCSID("@(#)$Id: mci.c,v 8.224 2013/03/12 15:24:53 ca Exp $") +SM_RCSID("@(#)$Id: mci.c,v 8.225 2013/11/22 20:51:56 ca Exp $") #if NETINET || NETINET6 # include diff --git a/contrib/sendmail/src/milter.c b/contrib/sendmail/src/milter.c index 958b608c2..88f8b601f 100644 --- a/contrib/sendmail/src/milter.c +++ b/contrib/sendmail/src/milter.c @@ -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 -SM_RCSID("@(#)$Id: milter.c,v 8.280 2013/01/16 18:48:36 ca Exp $") +SM_RCSID("@(#)$Id: milter.c,v 8.281 2013/11/22 20:51:56 ca Exp $") #if MILTER # include diff --git a/contrib/sendmail/src/mime.c b/contrib/sendmail/src/mime.c index f0fb54a8f..2022bb74f 100644 --- a/contrib/sendmail/src/mime.c +++ b/contrib/sendmail/src/mime.c @@ -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 #include -SM_RCSID("@(#)$Id: mime.c,v 8.148 2013/03/12 15:24:53 ca Exp $") +SM_RCSID("@(#)$Id: mime.c,v 8.149 2013/11/22 20:51:56 ca Exp $") /* ** MIME support. diff --git a/contrib/sendmail/src/newaliases.1 b/contrib/sendmail/src/newaliases.1 index 20fd0e74e..cae004160 100644 --- a/contrib/sendmail/src/newaliases.1 +++ b/contrib/sendmail/src/newaliases.1 @@ -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 8.19 2001/10/10 03:23:17 ca Exp $ +.\" $Id: newaliases.1,v 8.20 2013/11/22 20:51:56 ca Exp $ .\" -.TH NEWALIASES 1 "$Date: 2001/10/10 03:23:17 $" +.TH NEWALIASES 1 "$Date: 2013/11/22 20:51:56 $" .SH NAME newaliases \- rebuild the data base for the mail aliases file diff --git a/contrib/sendmail/src/parseaddr.c b/contrib/sendmail/src/parseaddr.c index 682a372db..d40f69b20 100644 --- a/contrib/sendmail/src/parseaddr.c +++ b/contrib/sendmail/src/parseaddr.c @@ -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 -SM_RCSID("@(#)$Id: parseaddr.c,v 8.406 2013/04/17 16:53:01 ca Exp $") +SM_RCSID("@(#)$Id: parseaddr.c,v 8.407 2013/11/22 20:51:56 ca Exp $") #include #include "map.h" diff --git a/contrib/sendmail/src/queue.c b/contrib/sendmail/src/queue.c index af60d5ebb..54cc4084d 100644 --- a/contrib/sendmail/src/queue.c +++ b/contrib/sendmail/src/queue.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2009, 2011, 2012 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2009, 2011, 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 #include -SM_RCSID("@(#)$Id: queue.c,v 8.998 2013/03/12 15:24:53 ca Exp $") +SM_RCSID("@(#)$Id: queue.c,v 8.1000 2013/11/22 20:51:56 ca Exp $") #include @@ -2940,7 +2940,7 @@ gatherq(qgrp, qdir, doall, full, more, pnentries) ** ** 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. ** diff --git a/contrib/sendmail/src/ratectrl.c b/contrib/sendmail/src/ratectrl.c index 773955a6d..50c776937 100644 --- a/contrib/sendmail/src/ratectrl.c +++ b/contrib/sendmail/src/ratectrl.c @@ -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 -SM_RCSID("@(#)$Id: ratectrl.c,v 8.13 2009/05/05 23:19:34 ca Exp $") +SM_RCSID("@(#)$Id: ratectrl.c,v 8.14 2013/11/22 20:51:56 ca Exp $") /* ** stuff included - given some warnings (inet_ntoa) diff --git a/contrib/sendmail/src/readcf.c b/contrib/sendmail/src/readcf.c index 2c8da0b9b..cdc172c2a 100644 --- a/contrib/sendmail/src/readcf.c +++ b/contrib/sendmail/src/readcf.c @@ -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 #include -SM_RCSID("@(#)$Id: readcf.c,v 8.690 2013/03/15 17:54:12 ca Exp $") +SM_RCSID("@(#)$Id: readcf.c,v 8.692 2013/11/22 20:51:56 ca Exp $") #if NETINET || NETINET6 # include @@ -2303,13 +2303,16 @@ static struct ssl_options long sslopt_bits; /* bits to set/clear */ } SSL_Option[] = { -/* these are turned on by default */ +/* 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 @@ -2346,9 +2349,18 @@ static struct ssl_options #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 @@ -2373,6 +2385,12 @@ static struct ssl_options #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 @@ -2384,6 +2402,9 @@ static struct ssl_options #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 { NULL, 0 } }; diff --git a/contrib/sendmail/src/recipient.c b/contrib/sendmail/src/recipient.c index 9f4c3f6e6..84d2f87f2 100644 --- a/contrib/sendmail/src/recipient.c +++ b/contrib/sendmail/src/recipient.c @@ -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 -SM_RCSID("@(#)$Id: recipient.c,v 8.350 2013/03/12 15:24:54 ca 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 *)); diff --git a/contrib/sendmail/src/sasl.c b/contrib/sendmail/src/sasl.c index 0e4e8e1d8..666616afc 100644 --- a/contrib/sendmail/src/sasl.c +++ b/contrib/sendmail/src/sasl.c @@ -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_RCSID("@(#)$Id: sasl.c,v 8.23 2012/11/27 18:53:13 gshapiro Exp $") +SM_RCSID("@(#)$Id: sasl.c,v 8.24 2013/11/22 20:51:56 ca Exp $") #if SASL # include diff --git a/contrib/sendmail/src/savemail.c b/contrib/sendmail/src/savemail.c index 33a897aee..2ea7d2f93 100644 --- a/contrib/sendmail/src/savemail.c +++ b/contrib/sendmail/src/savemail.c @@ -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 -SM_RCSID("@(#)$Id: savemail.c,v 8.318 2013/03/12 15:24:54 ca 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 *)); diff --git a/contrib/sendmail/src/sendmail.8 b/contrib/sendmail/src/sendmail.8 index 5097f2232..f225ff4b0 100644 --- a/contrib/sendmail/src/sendmail.8 +++ b/contrib/sendmail/src/sendmail.8 @@ -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 8.60 2011/03/07 23:44:48 ca Exp $ +.\" $Id: sendmail.8,v 8.61 2013/11/22 20:51:56 ca Exp $ .\" -.TH SENDMAIL 8 "$Date: 2011/03/07 23:44:48 $" +.TH SENDMAIL 8 "$Date: 2013/11/22 20:51:56 $" .SH NAME sendmail \- an electronic mail transport agent diff --git a/contrib/sendmail/src/sendmail.h b/contrib/sendmail/src/sendmail.h index 7487b6830..08bc2531c 100644 --- a/contrib/sendmail/src/sendmail.h +++ b/contrib/sendmail/src/sendmail.h @@ -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 8.1101 2013/03/15 17:54:12 ca Exp $"; +SM_UNUSED(static char SmailId[]) = "@(#)$Id: sendmail.h,v 8.1104 2013/11/22 20:51:56 ca Exp $"; # endif /* ! lint */ #endif /* _DEFINE */ @@ -478,6 +478,7 @@ struct mailer #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)); @@ -1841,7 +1842,7 @@ extern void setup_daemon_milters __P((void)); #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 */ diff --git a/contrib/sendmail/src/sfsasl.c b/contrib/sendmail/src/sfsasl.c index ebea3f2c0..1186b18ce 100644 --- a/contrib/sendmail/src/sfsasl.c +++ b/contrib/sendmail/src/sfsasl.c @@ -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,7 +9,7 @@ */ #include -SM_RCSID("@(#)$Id: sfsasl.c,v 8.120 2013/03/15 17:49:12 guenther Exp $") +SM_RCSID("@(#)$Id: sfsasl.c,v 8.121 2013/11/22 20:51:56 ca Exp $") #include #include #include diff --git a/contrib/sendmail/src/sfsasl.h b/contrib/sendmail/src/sfsasl.h index a92f772af..88f45c0e3 100644 --- a/contrib/sendmail/src/sfsasl.h +++ b/contrib/sendmail/src/sfsasl.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: sfsasl.h,v 8.20 2006/03/27 21:31:00 ca Exp $" + * $Id: sfsasl.h,v 8.21 2013/11/22 20:51:56 ca Exp $" */ #ifndef SFSASL_H diff --git a/contrib/sendmail/src/shmticklib.c b/contrib/sendmail/src/shmticklib.c index 6f5e301d2..df620b735 100644 --- a/contrib/sendmail/src/shmticklib.c +++ b/contrib/sendmail/src/shmticklib.c @@ -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_RCSID("@(#)$Id: shmticklib.c,v 8.14 2001/09/11 04:05:16 gshapiro Exp $") +SM_RCSID("@(#)$Id: shmticklib.c,v 8.15 2013/11/22 20:51:56 ca Exp $") #if _FFR_SHM_STATUS # include diff --git a/contrib/sendmail/src/sm_resolve.c b/contrib/sendmail/src/sm_resolve.c index b8a1405f9..d8fb6b7fa 100644 --- a/contrib/sendmail/src/sm_resolve.c +++ b/contrib/sendmail/src/sm_resolve.c @@ -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 8.39 2010/06/29 15:35:33 ca Exp $") +SM_RCSID("$Id: sm_resolve.c,v 8.40 2013/11/22 20:51:56 ca Exp $") static struct stot { diff --git a/contrib/sendmail/src/sm_resolve.h b/contrib/sendmail/src/sm_resolve.h index 7f169ba25..239fe7490 100644 --- a/contrib/sendmail/src/sm_resolve.h +++ b/contrib/sendmail/src/sm_resolve.h @@ -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 8.8 2001/09/01 00:06:02 gshapiro Exp $ */ +/* $Id: sm_resolve.h,v 8.9 2013/11/22 20:51:56 ca Exp $ */ #if DNSMAP # ifndef __ROKEN_RESOLVE_H__ diff --git a/contrib/sendmail/src/srvrsmtp.c b/contrib/sendmail/src/srvrsmtp.c index 0dfdf6b09..98998b481 100644 --- a/contrib/sendmail/src/srvrsmtp.c +++ b/contrib/sendmail/src/srvrsmtp.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2010, 2012, 2013 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2010, 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 @@ -17,7 +17,7 @@ # include #endif /* MILTER */ -SM_RCSID("@(#)$Id: srvrsmtp.c,v 8.1015 2013/03/12 15:24:54 ca Exp $") +SM_RCSID("@(#)$Id: srvrsmtp.c,v 8.1016 2013/11/22 20:51:56 ca Exp $") #include #include diff --git a/contrib/sendmail/src/stab.c b/contrib/sendmail/src/stab.c index 1c4c0c1f4..a04a3e582 100644 --- a/contrib/sendmail/src/stab.c +++ b/contrib/sendmail/src/stab.c @@ -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 -SM_RCSID("@(#)$Id: stab.c,v 8.91 2011/08/08 17:33:34 ca Exp $") +SM_RCSID("@(#)$Id: stab.c,v 8.92 2013/11/22 20:51:56 ca Exp $") /* ** STAB -- manage the symbol table diff --git a/contrib/sendmail/src/stats.c b/contrib/sendmail/src/stats.c index 16a9c6d2a..8a3b2db9b 100644 --- a/contrib/sendmail/src/stats.c +++ b/contrib/sendmail/src/stats.c @@ -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 -SM_RCSID("@(#)$Id: stats.c,v 8.57 2006/08/15 23:24:58 ca Exp $") +SM_RCSID("@(#)$Id: stats.c,v 8.58 2013/11/22 20:51:56 ca Exp $") #include diff --git a/contrib/sendmail/src/statusd_shm.h b/contrib/sendmail/src/statusd_shm.h index 7d889641f..980cf0f7f 100644 --- a/contrib/sendmail/src/statusd_shm.h +++ b/contrib/sendmail/src/statusd_shm.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: statusd_shm.h,v 8.7 2000/09/17 17:30:06 gshapiro Exp $ + * $Id: statusd_shm.h,v 8.8 2013/11/22 20:51:57 ca Exp $ * * Contributed by Exactis.com, Inc. * diff --git a/contrib/sendmail/src/sysexits.c b/contrib/sendmail/src/sysexits.c index 990ffe341..dde5a4bdd 100644 --- a/contrib/sendmail/src/sysexits.c +++ b/contrib/sendmail/src/sysexits.c @@ -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 -SM_RCSID("@(#)$Id: sysexits.c,v 8.34 2002/09/09 02:43:00 gshapiro 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. diff --git a/contrib/sendmail/src/timers.c b/contrib/sendmail/src/timers.c index 43dc07d05..735c93b1d 100644 --- a/contrib/sendmail/src/timers.c +++ b/contrib/sendmail/src/timers.c @@ -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_RCSID("@(#)$Id: timers.c,v 8.26 2006/08/15 23:24:58 ca Exp $") +SM_RCSID("@(#)$Id: timers.c,v 8.27 2013/11/22 20:51:57 ca Exp $") #if _FFR_TIMERS # include diff --git a/contrib/sendmail/src/timers.h b/contrib/sendmail/src/timers.h index d7faee19a..6b7c6486f 100644 --- a/contrib/sendmail/src/timers.h +++ b/contrib/sendmail/src/timers.h @@ -1,12 +1,12 @@ /* - * 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 * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Id: timers.h,v 8.6 2001/04/03 01:53:18 gshapiro Exp $ + * $Id: timers.h,v 8.7 2013/11/22 20:51:57 ca Exp $ * * Contributed by Exactis.com, Inc. * diff --git a/contrib/sendmail/src/tls.c b/contrib/sendmail/src/tls.c index 60d408e5e..a9c963c58 100644 --- a/contrib/sendmail/src/tls.c +++ b/contrib/sendmail/src/tls.c @@ -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,7 +10,7 @@ #include -SM_RCSID("@(#)$Id: tls.c,v 8.121 2013/01/02 23:54:17 ca Exp $") +SM_RCSID("@(#)$Id: tls.c,v 8.127 2013/11/27 02:51:11 gshapiro Exp $") #if STARTTLS # include @@ -282,6 +282,7 @@ init_tls_library(fipsmode) /* 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(); @@ -645,8 +646,9 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar /* ** valid values for dhparam are (only the first char is checked) ** none no parameters: don't use DH - ** 512 generate 512 bit parameters (fixed) + ** 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 for server, 512 for client (OK? XXX) */ @@ -659,6 +661,8 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar if (c == '1') req |= TLS_I_DH1024; + else if (c == '2') + req |= TLS_I_DH2048; else if (c == '5') req |= TLS_I_DH512; else if (c != 'n' && c != 'N' && c != '/') @@ -970,6 +974,9 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar /* Diffie-Hellman initialization */ if (bitset(TLS_I_TRY_DH, req)) { +#if _FFR_TLS_EC + EC_KEY *ecdh; +#endif /* _FFR_TLS_EC */ if (bitset(TLS_S_DHPAR_OK, status)) { BIO *bio; @@ -1003,19 +1010,28 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar } } } - 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)) + { + if (tTd(96, 2)) + sm_dprintf("inittls: Using precomputed 512 bit DH parameters\n"); dh = get_dh512(); + } if (dh == NULL) { @@ -1034,16 +1050,27 @@ inittls(ctx, req, options, srv, certfile, keyfile, cacertpath, cacertfile, dhpar } 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)", 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 */ diff --git a/contrib/sendmail/src/trace.c b/contrib/sendmail/src/trace.c index 4a9051e58..6efd09e68 100644 --- a/contrib/sendmail/src/trace.c +++ b/contrib/sendmail/src/trace.c @@ -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 #include -SM_RCSID("@(#)$Id: trace.c,v 8.38 2002/12/05 17:28:35 ca 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 *)); diff --git a/contrib/sendmail/src/udb.c b/contrib/sendmail/src/udb.c index 22b198e4e..6ee88ce91 100644 --- a/contrib/sendmail/src/udb.c +++ b/contrib/sendmail/src/udb.c @@ -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 8.165 2010/01/10 06:22:00 ca 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 8.165 2010/01/10 06:22:00 ca 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 diff --git a/contrib/sendmail/src/usersmtp.c b/contrib/sendmail/src/usersmtp.c index af98bdab9..76af5320b 100644 --- a/contrib/sendmail/src/usersmtp.c +++ b/contrib/sendmail/src/usersmtp.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2006, 2008-2010 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2006, 2008-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 -SM_RCSID("@(#)$Id: usersmtp.c,v 8.486 2013/03/12 15:24:54 ca Exp $") +SM_RCSID("@(#)$Id: usersmtp.c,v 8.488 2013/11/22 20:51:57 ca Exp $") #include diff --git a/contrib/sendmail/src/util.c b/contrib/sendmail/src/util.c index 8ea26200c..b03fa66cf 100644 --- a/contrib/sendmail/src/util.c +++ b/contrib/sendmail/src/util.c @@ -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 -SM_RCSID("@(#)$Id: util.c,v 8.426 2013/03/12 15:24:54 ca Exp $") +SM_RCSID("@(#)$Id: util.c,v 8.427 2013/11/22 20:51:57 ca Exp $") #include #include diff --git a/contrib/sendmail/src/version.c b/contrib/sendmail/src/version.c index 05ad66ac9..3f85c0696 100644 --- a/contrib/sendmail/src/version.c +++ b/contrib/sendmail/src/version.c @@ -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 Eric P. Allman. All rights reserved. * Copyright (c) 1988, 1993 @@ -13,6 +13,6 @@ #include -SM_RCSID("@(#)$Id: version.c,v 8.243 2013/04/18 15:07:17 ca Exp $") +SM_RCSID("@(#)$Id: version.c,v 8.249 2013/11/27 00:38:50 ca Exp $") -char Version[] = "8.14.7"; +char Version[] = "8.14.8"; diff --git a/contrib/sendmail/test/README b/contrib/sendmail/test/README index d715bbb1e..5c3851bfc 100644 --- a/contrib/sendmail/test/README +++ b/contrib/sendmail/test/README @@ -1,11 +1,11 @@ -# 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 # forth in the LICENSE file which can be found at the top level of # the sendmail distribution. # -# $Id: README,v 1.2 2001/09/28 16:36:28 ca Exp $ +# $Id: README,v 1.3 2013/11/22 20:52:01 ca Exp $ # This directory contains several programs to test various OS calls. diff --git a/contrib/sendmail/test/t_dropgid.c b/contrib/sendmail/test/t_dropgid.c index cb166d0ad..4f8aedcfb 100644 --- a/contrib/sendmail/test/t_dropgid.c +++ b/contrib/sendmail/test/t_dropgid.c @@ -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 #ifndef lint -static char id[] = "@(#)$Id: t_dropgid.c,v 1.6 2001/09/28 16:36:28 ca Exp $"; +static char id[] = "@(#)$Id: t_dropgid.c,v 1.7 2013/11/22 20:52:01 ca Exp $"; #endif /* ! lint */ static void diff --git a/contrib/sendmail/test/t_exclopen.c b/contrib/sendmail/test/t_exclopen.c index f1bde7220..08670cd74 100644 --- a/contrib/sendmail/test/t_exclopen.c +++ b/contrib/sendmail/test/t_exclopen.c @@ -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 #ifndef lint -static char id[] = "@(#)$Id: t_exclopen.c,v 8.6 2001/09/23 03:35:41 ca 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]; diff --git a/contrib/sendmail/test/t_pathconf.c b/contrib/sendmail/test/t_pathconf.c index 2baaaa61d..e3c7c7f2d 100644 --- a/contrib/sendmail/test/t_pathconf.c +++ b/contrib/sendmail/test/t_pathconf.c @@ -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 #ifndef lint -static char id[] = "@(#)$Id: t_pathconf.c,v 8.6 2001/09/23 03:35:41 ca Exp $"; +static char id[] = "@(#)$Id: t_pathconf.c,v 8.7 2013/11/22 20:52:01 ca Exp $"; #endif /* ! lint */ int diff --git a/contrib/sendmail/test/t_seteuid.c b/contrib/sendmail/test/t_seteuid.c index 9fab8981c..f64b93be8 100644 --- a/contrib/sendmail/test/t_seteuid.c +++ b/contrib/sendmail/test/t_seteuid.c @@ -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 #ifndef lint -static char id[] = "@(#)$Id: t_seteuid.c,v 8.8 2001/09/23 03:35:41 ca Exp $"; +static char id[] = "@(#)$Id: t_seteuid.c,v 8.9 2013/11/22 20:52:01 ca Exp $"; #endif /* ! lint */ #ifdef __hpux diff --git a/contrib/sendmail/test/t_setgid.c b/contrib/sendmail/test/t_setgid.c index dfe180587..a7d6bc591 100644 --- a/contrib/sendmail/test/t_setgid.c +++ b/contrib/sendmail/test/t_setgid.c @@ -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 #ifndef lint -static char id[] = "@(#)$Id: t_setgid.c,v 1.6 2001/09/23 03:35:41 ca Exp $"; +static char id[] = "@(#)$Id: t_setgid.c,v 1.7 2013/11/22 20:52:01 ca Exp $"; #endif /* ! lint */ static void diff --git a/contrib/sendmail/test/t_setreuid.c b/contrib/sendmail/test/t_setreuid.c index b307b0803..1eef37cd6 100644 --- a/contrib/sendmail/test/t_setreuid.c +++ b/contrib/sendmail/test/t_setreuid.c @@ -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 #ifndef lint -static char id[] = "@(#)$Id: t_setreuid.c,v 8.9 2001/10/12 03:04:46 gshapiro Exp $"; +static char id[] = "@(#)$Id: t_setreuid.c,v 8.10 2013/11/22 20:52:01 ca Exp $"; #endif /* ! lint */ #ifdef __hpux diff --git a/contrib/sendmail/test/t_setuid.c b/contrib/sendmail/test/t_setuid.c index 653333929..0d4f9f064 100644 --- a/contrib/sendmail/test/t_setuid.c +++ b/contrib/sendmail/test/t_setuid.c @@ -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 #ifndef lint -static char id[] = "@(#)$Id: t_setuid.c,v 8.7 2001/09/23 03:35:41 ca Exp $"; +static char id[] = "@(#)$Id: t_setuid.c,v 8.8 2013/11/22 20:52:01 ca Exp $"; #endif /* ! lint */ static void diff --git a/contrib/sendmail/test/t_snprintf.c b/contrib/sendmail/test/t_snprintf.c index 8a0378fa2..b78f2d5ec 100644 --- a/contrib/sendmail/test/t_snprintf.c +++ b/contrib/sendmail/test/t_snprintf.c @@ -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 #ifndef lint -static char id[] = "@(#)$Id: t_snprintf.c,v 8.4 2001/09/23 03:35:41 ca 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" diff --git a/contrib/sendmail/vacation/vacation.1 b/contrib/sendmail/vacation/vacation.1 index 6c1418a0b..3f9c158e8 100644 --- a/contrib/sendmail/vacation/vacation.1 +++ b/contrib/sendmail/vacation/vacation.1 @@ -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 8.34 2002/06/27 23:51:52 ca Exp $ +.\" $Id: vacation.1,v 8.35 2013/11/22 20:52:02 ca Exp $ .\" -.TH VACATION 1 "$Date: 2002/06/27 23:51:52 $" +.TH VACATION 1 "$Date: 2013/11/22 20:52:02 $" .SH NAME vacation \- E-mail auto-responder diff --git a/contrib/sendmail/vacation/vacation.c b/contrib/sendmail/vacation/vacation.c index 4cc106e30..00cbdc15c 100644 --- a/contrib/sendmail/vacation/vacation.c +++ b/contrib/sendmail/vacation/vacation.c @@ -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_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 8.147 2013/03/12 15:24:56 ca Exp $") +SM_IDSTR(id, "@(#)$Id: vacation.c,v 8.148 2013/11/22 20:52:02 ca Exp $") #include -- 2.45.0