From ce3eb1730260050f7d63b9fb6def939ebbf41d88 Mon Sep 17 00:00:00 2001 From: gshapiro Date: Sat, 20 Apr 2002 19:51:37 +0000 Subject: Remove files no longer in vendor release from vendor branch. --- contrib/sendmail/cf/m4/nullrelay.m4 | 113 ------------------------------------ 1 file changed, 113 deletions(-) delete mode 100644 contrib/sendmail/cf/m4/nullrelay.m4 (limited to 'contrib/sendmail/cf/m4') diff --git a/contrib/sendmail/cf/m4/nullrelay.m4 b/contrib/sendmail/cf/m4/nullrelay.m4 deleted file mode 100644 index b71fd57..0000000 --- a/contrib/sendmail/cf/m4/nullrelay.m4 +++ /dev/null @@ -1,113 +0,0 @@ -divert(-1) -# -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. -# Copyright (c) 1983, 1995 Eric P. Allman. All rights reserved. -# Copyright (c) 1988, 1993 -# The Regents of the University of California. 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. -# -# -divert(0) - -VERSIONID(`@(#)nullrelay.m4 8.19 (Berkeley) 5/19/1998') - -# -# This configuration applies only to relay-only hosts. They send -# all mail to a hub without consideration of the address syntax -# or semantics, except for adding the hub qualification to the -# addresses. -# -# This is based on a prototype done by Bryan Costales of ICSI. -# - -###################################################################### -###################################################################### -##### -##### REWRITING RULES -##### -###################################################################### -###################################################################### - -########################################### -### Rulset 3 -- Name Canonicalization ### -########################################### -S3 - -# handle null input -R$@ $@ <@> - -# strip group: syntax (not inside angle brackets!) and trailing semicolon -R$* $: $1 <@> mark addresses -R$* < $* > $* <@> $: $1 < $2 > $3 unmark -R$* :: $* <@> $: $1 :: $2 unmark node::addr -R:`include': $* <@> $: :`include': $1 unmark :`include':... -R$* : $* <@> $: $2 strip colon if marked -R$* <@> $: $1 unmark -R$* ; $1 strip trailing semi -R$* < $* ; > $1 < $2 > bogus bracketed semi - -# null input now results from list:; syntax -R$@ $@ :; <@> - -# basic textual canonicalization -- note RFC733 heuristic here -R$* $: < $1 > housekeeping <> -R$+ < $* > < $2 > strip excess on left -R< $* > $+ < $1 > strip excess on right -R<> $@ < @ > MAIL FROM:<> case -R< $+ > $: $1 remove housekeeping <> - -ifdef(`_NO_CANONIFY_', `dnl', -`# eliminate local host if present -R@ $=w $=: $+ $@ @ $M $2 $3 @thishost ... -R@ $+ $@ @ $1 @somewhere ... - -R$=E @ $=w $@ $1 @ $2 leave exposed -R$+ @ $=w $@ $1 @ $M ...@thishost -R$+ @ $+ $@ $1 @ $2 ...@somewhere - -R$=w ! $=E $@ $2 @ $1 leave exposed -R$=w ! $+ $@ $2 @ $M thishost!... -R$+ ! $+ $@ $1 ! $2 @ $M somewhere ! ... - -R$=E % $=w $@ $1 @ $2 leave exposed -R$+ % $=w $@ $1 @ $M ...%thishost -R$+ % $+ $@ $1 @ $2 ...%somewhere - -R$=E $@ $1 @ $j leave exposed -R$+ $@ $1 @ $M unadorned user') - - -###################################### -### Ruleset 0 -- Parse Address ### -###################################### - -S0 - -R$*:;<@> $#error $@ USAGE $: "List:; syntax illegal for recipient addresses" - -# pass everything else to a relay host -R$* $#_RELAY_ $@ $H $: $1 - - -################################################## -### Ruleset 4 -- Final Output Post-rewriting ### -################################################## -S4 - -R$* <@> $@ handle <> and list:; - -# strip trailing dot off before passing to nullclient relay -R$* @ $+ . $1 @ $2 - -# -###################################################################### -###################################################################### -##### -`##### MAILER DEFINITIONS' -##### -###################################################################### -###################################################################### -undivert(7)dnl -- cgit v1.1 From e226f8e879ed5a8d2f5cc433067b698e07dce0b6 Mon Sep 17 00:00:00 2001 From: gshapiro Date: Sat, 20 Apr 2002 20:31:51 +0000 Subject: Import of post-8.12.3 bug fixes from vendor repository. These are being imported for the upcoming FreeBSD 4.6 release. --- contrib/sendmail/cf/m4/cf.m4 | 2 +- contrib/sendmail/cf/m4/cfhead.m4 | 2 +- contrib/sendmail/cf/m4/proto.m4 | 3 ++- contrib/sendmail/cf/m4/version.m4 | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) (limited to 'contrib/sendmail/cf/m4') diff --git a/contrib/sendmail/cf/m4/cf.m4 b/contrib/sendmail/cf/m4/cf.m4 index 4f5712b..ba96059 100644 --- a/contrib/sendmail/cf/m4/cf.m4 +++ b/contrib/sendmail/cf/m4/cf.m4 @@ -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 1.1.1.3 2000/08/12 21:55:37 gshapiro Exp $')') diff --git a/contrib/sendmail/cf/m4/cfhead.m4 b/contrib/sendmail/cf/m4/cfhead.m4 index 708a095..c25680c 100644 --- a/contrib/sendmail/cf/m4/cfhead.m4 +++ b/contrib/sendmail/cf/m4/cfhead.m4 @@ -301,4 +301,4 @@ define(`confMILTER_MACROS_ENVRCPT', ``{rcpt_mailer}, {rcpt_host}, {rcpt_addr}'') divert(0)dnl -VERSIONID(`$Id: cfhead.m4,v 8.107 2001/07/22 03:25:37 ca Exp $') +VERSIONID(`$Id: cfhead.m4,v 1.1.1.7 2002/02/17 21:56:44 gshapiro Exp $') diff --git a/contrib/sendmail/cf/m4/proto.m4 b/contrib/sendmail/cf/m4/proto.m4 index bac01ed..51bf84e 100644 --- a/contrib/sendmail/cf/m4/proto.m4 +++ b/contrib/sendmail/cf/m4/proto.m4 @@ -13,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: proto.m4,v 8.639 2002/04/02 23:42:42 gshapiro Exp $') +VERSIONID(`$Id: proto.m4,v 1.1.1.11 2002/04/10 03:04:58 gshapiro Exp $') # level CF_LEVEL config file format V`'CF_LEVEL/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Berkeley') @@ -1178,6 +1178,7 @@ R$+ $: $1 $| $&h $| $&{Host} check h and {Host} R$+ $| $| $: $(macro {Host} $@ $) $1 no h or {Host} R$+ $| $| $+ $: $1 h not set, {Host} set R$+ $| +$* $| $* $: $1 h is +detail, {Host} set +R$+ $| $* @ $+ $| $* $: $(macro {Host} $@ @$3 $) $1 set {Host} to host in h R$+ $| $+ $| $* $: $(macro {Host} $@ @$2 $) $1 set {Host} to h ')dnl diff --git a/contrib/sendmail/cf/m4/version.m4 b/contrib/sendmail/cf/m4/version.m4 index adb592f..1e9c6b2 100644 --- a/contrib/sendmail/cf/m4/version.m4 +++ b/contrib/sendmail/cf/m4/version.m4 @@ -11,7 +11,7 @@ divert(-1) # the sendmail distribution. # # -VERSIONID(`$Id: version.m4,v 8.89 2002/04/04 22:20:08 ca Exp $') +VERSIONID(`$Id: version.m4,v 1.1.1.12 2002/04/10 03:04:58 gshapiro Exp $') # divert(0) # Configuration version number -- cgit v1.1