summaryrefslogtreecommitdiff
path: root/usr/src/cmd/sendmail/cf/m4
diff options
context:
space:
mode:
authorjbeck <none@none>2007-11-02 15:39:34 -0700
committerjbeck <none@none>2007-11-02 15:39:34 -0700
commit7800901e60d340b6af88e94a2149805dcfcaaf56 (patch)
treef5262ef9246bc6fb6ce10e12604839e39913e643 /usr/src/cmd/sendmail/cf/m4
parentae43f94f532f9bb12ac36b64580b6fe707d1129f (diff)
downloadillumos-joyent-7800901e60d340b6af88e94a2149805dcfcaaf56.tar.gz
PSARC 2007/551 getldapaliasbyname clarification
6337505 Sendmail is unable to use LDAP mail aliases > 256 bytes 6547700 sendmail's ratecontrol limit is off by one 6625320 upgrade sendmail to 8.14.2
Diffstat (limited to 'usr/src/cmd/sendmail/cf/m4')
-rw-r--r--usr/src/cmd/sendmail/cf/m4/proto.m410
-rw-r--r--usr/src/cmd/sendmail/cf/m4/version.m44
2 files changed, 7 insertions, 7 deletions
diff --git a/usr/src/cmd/sendmail/cf/m4/proto.m4 b/usr/src/cmd/sendmail/cf/m4/proto.m4
index c6282754d7..692f2e6f30 100644
--- a/usr/src/cmd/sendmail/cf/m4/proto.m4
+++ b/usr/src/cmd/sendmail/cf/m4/proto.m4
@@ -18,7 +18,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`$Id: proto.m4,v 8.730 2007/02/01 18:50:03 ca Exp $')
+VERSIONID(`$Id: proto.m4,v 8.732 2007/04/20 00:53:30 ca Exp $')
# level CF_LEVEL config file format
V`'CF_LEVEL/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Sun')
@@ -2967,9 +2967,9 @@ ifdef(`_ATMPF_', `dnl tempfail?
R<$* _ATMPF_> $#error $@ 4.3.0 $: "451 Temporary system failure. Please try again later."', `dnl')
dnl use the generic routine (for now)
R<0> $@ OK no limit
-R<$+> $: <$1> $| $(arith l $@ $&{client_rate} $@ $1 $)
+R<$+> $: <$1> $| $(arith l $@ $1 $@ $&{client_rate} $)
dnl log this? Connection rate $&{client_rate} exceeds limit $1.
-R<$+> $| FALSE $#error $@ 4.3.2 $: _RATE_CONTROL_REPLY Connection rate limit exceeded.
+R<$+> $| TRUE $#error $@ 4.3.2 $: _RATE_CONTROL_REPLY Connection rate limit exceeded.
')')
ifdef(`_CONN_CONTROL_',`dnl
@@ -2989,9 +2989,9 @@ ifdef(`_ATMPF_', `dnl tempfail?
R<$* _ATMPF_> $#error $@ 4.3.0 $: "451 Temporary system failure. Please try again later."', `dnl')
dnl use the generic routine (for now)
R<0> $@ OK no limit
-R<$+> $: <$1> $| $(arith l $@ $&{client_connections} $@ $1 $)
+R<$+> $: <$1> $| $(arith l $@ $1 $@ $&{client_connections} $)
dnl log this: Open connections $&{client_connections} exceeds limit $1.
-R<$+> $| FALSE $#error $@ 4.3.2 $: _CONN_CONTROL_REPLY Too many open connections.
+R<$+> $| TRUE $#error $@ 4.3.2 $: _CONN_CONTROL_REPLY Too many open connections.
')')
undivert(9)dnl LOCAL_RULESETS
diff --git a/usr/src/cmd/sendmail/cf/m4/version.m4 b/usr/src/cmd/sendmail/cf/m4/version.m4
index 68b206b176..ce70aefff7 100644
--- a/usr/src/cmd/sendmail/cf/m4/version.m4
+++ b/usr/src/cmd/sendmail/cf/m4/version.m4
@@ -12,8 +12,8 @@ divert(-1)
#
# ident "%Z%%M% %I% %E% SMI"
#
-VERSIONID(`$Id: version.m4,v 8.178 2007/04/03 21:21:18 ca Exp $')
+VERSIONID(`$Id: version.m4,v 8.186 2007/10/31 16:04:13 ca Exp $')
#
divert(0)
# Configuration version number
-DZ8.14.1`'ifdef(`confCF_VERSION', `/confCF_VERSION')
+DZ8.14.2`'ifdef(`confCF_VERSION', `/confCF_VERSION')