diff options
author | gshapiro <gshapiro@FreeBSD.org> | 2004-08-01 01:16:16 +0000 |
---|---|---|
committer | gshapiro <gshapiro@FreeBSD.org> | 2004-08-01 01:16:16 +0000 |
commit | ca912893b4e0f16e958e36418347959a0ae09777 (patch) | |
tree | 5704eaef24b151f52d05eed1fa8736f38da24bd1 /contrib/sendmail/cf/m4/cfhead.m4 | |
parent | 54475e38255c3f385a9fce62d272ba4577d0d3f4 (diff) | |
download | FreeBSD-src-ca912893b4e0f16e958e36418347959a0ae09777.zip FreeBSD-src-ca912893b4e0f16e958e36418347959a0ae09777.tar.gz |
Resolve conflicts from sendmail 8.13.1 import
Diffstat (limited to 'contrib/sendmail/cf/m4/cfhead.m4')
-rw-r--r-- | contrib/sendmail/cf/m4/cfhead.m4 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/sendmail/cf/m4/cfhead.m4 b/contrib/sendmail/cf/m4/cfhead.m4 index 8828da9..dc1d8ba 100644 --- a/contrib/sendmail/cf/m4/cfhead.m4 +++ b/contrib/sendmail/cf/m4/cfhead.m4 @@ -1,5 +1,5 @@ # -# Copyright (c) 1998-2003 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers. # All rights reserved. # Copyright (c) 1983, 1995 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -304,7 +304,8 @@ define(`confMILTER_MACROS_CONNECT', ``j, _, {daemon_name}, {if_name}, {if_addr}' define(`confMILTER_MACROS_HELO', ``{tls_version}, {cipher}, {cipher_bits}, {cert_subject}, {cert_issuer}'') define(`confMILTER_MACROS_ENVFROM', ``i, {auth_type}, {auth_authen}, {auth_ssf}, {auth_author}, {mail_mailer}, {mail_host}, {mail_addr}'') define(`confMILTER_MACROS_ENVRCPT', ``{rcpt_mailer}, {rcpt_host}, {rcpt_addr}'') +define(`confMILTER_MACROS_EOM', `{msg_id}') divert(0)dnl -VERSIONID(`$Id: cfhead.m4,v 8.108.2.6 2003/12/05 02:26:47 ca Exp $') +VERSIONID(`$Id: cfhead.m4,v 8.116 2004/01/28 22:02:22 ca Exp $') |