diff options
Diffstat (limited to 'gnu/usr.sbin/sendmail/cf')
| -rw-r--r-- | gnu/usr.sbin/sendmail/cf/README | 4 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/cf/cf/courtesan.mc | 7 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/cf/m4/proto.m4 | 21 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/cf/m4/version.m4 | 4 |
4 files changed, 23 insertions, 13 deletions
diff --git a/gnu/usr.sbin/sendmail/cf/README b/gnu/usr.sbin/sendmail/cf/README index cd487e958d8..9221428911b 100644 --- a/gnu/usr.sbin/sendmail/cf/README +++ b/gnu/usr.sbin/sendmail/cf/README @@ -350,7 +350,7 @@ USENET_MAILER_ARGS [-m -h -n] The command line arguments for the (such as those shipped with newer versions of INN) use different flags. Double check the defaults against the inews man page. -USENET_MAILER_MAX [100000] The maximum size of messages that will +USENET_MAILER_MAX [undefined] The maximum size of messages that will be accepted by the usenet mailer. USENET_MAILER_QGRP [undefined] The queue group for the usenet mailer. SMTP_MAILER_FLAGS [undefined] Flags added to SMTP mailer. Default @@ -4311,4 +4311,4 @@ M4 DIVERSIONS 8 DNS based blacklists 9 special local rulesets (1 and 2) -$Revision: 1.14 $, Last updated $Date: 2002/06/26 04:48:54 $ +$Revision: 1.15 $, Last updated $Date: 2002/09/15 02:23:35 $ diff --git a/gnu/usr.sbin/sendmail/cf/cf/courtesan.mc b/gnu/usr.sbin/sendmail/cf/cf/courtesan.mc index 5e55c2d4651..094ce4dc822 100644 --- a/gnu/usr.sbin/sendmail/cf/cf/courtesan.mc +++ b/gnu/usr.sbin/sendmail/cf/cf/courtesan.mc @@ -4,7 +4,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$OpenBSD: courtesan.mc,v 1.9 2002/01/14 03:21:39 millert Exp $') +VERSIONID(`$OpenBSD: courtesan.mc,v 1.10 2002/09/15 02:23:35 millert Exp $') OSTYPE(openbsd) dnl dnl First, we override some default values @@ -13,6 +13,11 @@ define(`confSMTP_LOGIN_MSG', `$m Sendmail $v/$Z/courtesan ready at $b')dnl define(`confMAX_HOP', `20')dnl define(`confMAX_MIME_HEADER_LENGTH', `256/128')dnl dnl +dnl Deliver interactively so we don't end up with lots of messages +dnl waiting on a procmail lock. +define(`confDELIVERY_MODE', `interactive')dnl +define(`confSAFE_QUEUE', `Interactive')dnl +dnl dnl Some broken nameservers will return SERVFAIL (a temporary failure) dnl on T_AAAA (IPv6) lookups. define(`confBIND_OPTS', `WorkAroundBrokenAAAA')dnl diff --git a/gnu/usr.sbin/sendmail/cf/m4/proto.m4 b/gnu/usr.sbin/sendmail/cf/m4/proto.m4 index c416a00816b..0c1b0659d6e 100644 --- a/gnu/usr.sbin/sendmail/cf/m4/proto.m4 +++ b/gnu/usr.sbin/sendmail/cf/m4/proto.m4 @@ -13,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`$Sendmail: proto.m4,v 8.649 2002/06/13 18:53:24 ca Exp $') +VERSIONID(`$Sendmail: proto.m4,v 8.649.2.5 2002/08/15 02:39:01 ca Exp $') # level CF_LEVEL config file format V`'CF_LEVEL/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Berkeley') @@ -1424,8 +1424,8 @@ SLDAPExpand R<$+><$+><$*> $: <$(ldapmra $2 $: $)> <$(ldapmh $2 $: $)> <$1> <$2> <$3> # look for temporary failures (return original address, MTA will queue up) -R<$* <TMPF>> <$*> <$+> <$+> <$*> $@ $2 -R<$*> <$* <TMPF>> <$+> <$+> <$*> $@ $2 +R<$* <TMPF>> <$*> <$+> <$+> <$*> $@ $3 +R<$*> <$* <TMPF>> <$+> <$+> <$*> $@ $3 # if mailRoutingAddress and local or non-existant mailHost, # return the new mailRoutingAddress @@ -1800,10 +1800,10 @@ dnl workspace: <?> CanonicalAddress (i.e. address in canonical form localpart<@h dnl there is nothing behind the <@host> so no trailing $* needed R<?> $* < @ $+ . > <?> $1 < @ $2 > strip trailing dots # handle non-DNS hostnames (*.bitnet, *.decnet, *.uucp, etc) -R<?> $* < @ $* $=P > $: <OK> $1 < @ $2 $3 > +R<?> $* < @ $* $=P > $: <_RES_OK_> $1 < @ $2 $3 > dnl workspace <mark> CanonicalAddress where mark is ? or OK dnl A sender address with my local host name ($j) is safe -R<?> $* < @ $j > $: <OK> $1 < @ $j > +R<?> $* < @ $j > $: <_RES_OK_> $1 < @ $j > ifdef(`_ACCEPT_UNRESOLVABLE_DOMAINS_', `R<?> $* < @ $+ > $: <_RES_OK_> $1 < @ $2 > ... unresolvable OK', `R<?> $* < @ $+ > $: <? $(resolve $2 $: $2 <PERM> $) > $1 < @ $2 > @@ -1842,7 +1842,7 @@ R$* u $* $| <?> $* $: <_RES_OK_> $3 dnl remove daemon_flags R$* $| $* $: $2 R<?> $* $: < ? $&{client_name} > $1 -R<?> $* $@ <OK> ...local unqualed ok +R<?> $* $@ <_RES_OK_> ...local unqualed ok R<? $+> $* $#error $@ 5.5.4 $: "_CODE553 Domain name required for sender address " $&f ...remote is not') # check results @@ -2102,7 +2102,12 @@ R$=R $* $@ RELAY relayable IP address ifdef(`_ACCESS_TABLE_', `dnl R$* $: $>A <$1> <?> <+ Connect> <$1> R<RELAY> $* $@ RELAY relayable IP address -R<REJECT> $* $@ REJECT rejected IP address +ifdef(`_FFR_REJECT_IP_IN_CHECK_RCPT_',`dnl +dnl this will cause rejections in cases like: +dnl Connect:My.Host.Domain RELAY +dnl Connect:My.Net REJECT +dnl since in check_relay client_name is checked before client_addr +R<REJECT> $* $@ REJECT rejected IP address') ifdef(`_ATMPF_', `R<_ATMPF_> $* $#TEMP $@ 4.3.0 $: "451 Temporary system failure. Please try again later."', `dnl') R<$*> <$*> $: $2', `dnl') R$* $: [ $1 ] put brackets around it... @@ -2471,7 +2476,7 @@ R<?>$* $@ OK ifdef(`_ATMPF_', `dnl tempfail? R<$* _ATMPF_>$* $#error $@ 4.3.0 $: "451 Temporary system failure. Please try again later."', `dnl') R<NO>$* $#error $@ 5.7.1 $: "550 do not try TLS with " $&{server_name} " ["$&{server_addr}"]" - + ###################################################################### ### tls_rcpt: is connection with server "good" enough? ### (done in client, per recipient) diff --git a/gnu/usr.sbin/sendmail/cf/m4/version.m4 b/gnu/usr.sbin/sendmail/cf/m4/version.m4 index 43f3a30190a..133682ab5f4 100644 --- a/gnu/usr.sbin/sendmail/cf/m4/version.m4 +++ b/gnu/usr.sbin/sendmail/cf/m4/version.m4 @@ -11,8 +11,8 @@ divert(-1) # the sendmail distribution. # # -VERSIONID(`$Sendmail: version.m4,v 8.92.2.2 2002/06/25 22:51:52 ca Exp $') +VERSIONID(`$Sendmail: version.m4,v 8.92.2.5 2002/08/24 16:27:23 ca Exp $') # divert(0) # Configuration version number -DZ8.12.5`'ifdef(`confCF_VERSION', `/confCF_VERSION') +DZ8.12.6`'ifdef(`confCF_VERSION', `/confCF_VERSION') |