diff options
Diffstat (limited to 'usr/src/cmd/sendmail/cf/m4/proto.m4')
| -rw-r--r-- | usr/src/cmd/sendmail/cf/m4/proto.m4 | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/usr/src/cmd/sendmail/cf/m4/proto.m4 b/usr/src/cmd/sendmail/cf/m4/proto.m4 index 6f03587e1a..c6282754d7 100644 --- a/usr/src/cmd/sendmail/cf/m4/proto.m4 +++ b/usr/src/cmd/sendmail/cf/m4/proto.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998-2006 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-2007 Sendmail, Inc. and its suppliers. # All rights reserved. # Copyright (c) 1983, 1995 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -18,7 +18,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: proto.m4,v 8.726 2007/01/04 18:27:46 ca Exp $') +VERSIONID(`$Id: proto.m4,v 8.730 2007/02/01 18:50:03 ca Exp $') # level CF_LEVEL config file format V`'CF_LEVEL/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Sun') @@ -569,6 +569,9 @@ ifdef(`confUNSAFE_GROUP_WRITES', # where do errors that occur when sending errors get sent? _OPTION(DoubleBounceAddress, `confDOUBLE_BOUNCE_ADDRESS', `postmaster') +# issue temporary errors (4xy) instead of permanent errors (5xy)? +_OPTION(SoftBounce, `confSOFT_BOUNCE', `False') + # where to save bounces if all else fails _OPTION(DeadLetterDrop, `confDEAD_LETTER_DROP', `/var/tmp/dead.letter') @@ -652,7 +655,9 @@ _OPTION(Milter.macros.connect, `confMILTER_MACROS_CONNECT', `') _OPTION(Milter.macros.helo, `confMILTER_MACROS_HELO', `') _OPTION(Milter.macros.envfrom, `confMILTER_MACROS_ENVFROM', `') _OPTION(Milter.macros.envrcpt, `confMILTER_MACROS_ENVRCPT', `') -_OPTION(Milter.macros.eom, `confMILTER_MACROS_EOM', `')') +_OPTION(Milter.macros.eom, `confMILTER_MACROS_EOM', `') +_OPTION(Milter.macros.eoh, `confMILTER_MACROS_EOH', `') +_OPTION(Milter.macros.data, `confMILTER_MACROS_DATA', `')') # CA directory _OPTION(CACertPath, `confCACERT_PATH', `') |