40,41c40,41
< ##### built by root@eve on Fri Mar 1 06:26:14 PST 1996
< ##### in /usr/local/src/mail/sendmail-8.7.4/cf/cf
---
> ##### built by brett@eve on Thu Aug 21 10:07:38 PDT 1997
> ##### in /home/brett/sendmail-8.7.4/cf/cf
52c52,54
< #####  @(#)nouucp.m4	8.1 (Berkeley) 6/7/93  #####
---
> #####  @(#)generic.m4	8.2 (Berkeley) 4/21/95  #####
> 
> #####  @(#)redirect.m4	8.4 (Berkeley) 6/25/95  #####
70,75c72
< Fw/etc/sendmail.cw
< 
< # file containing names of virtual domains
< Fv/etc/sendmail.cv
< 
< Kvirtual dbm /etc/virtual
---
> Fw-o /etc/sendmail.cw
80a78
> 
91c89
< CO @ % 
---
> CO @ % !
123a122,123
> CPREDIRECT
> 
127,128d126
< # Hack for virtual email domains - RJL20
< Kmaildomains hash /etc/vmail/vmail.db
288c286
< O QueueLA=25
---
> #O QueueLA=8
291c289
< O RefuseLA=30
---
> #O RefuseLA=12
369,370d366
< Tmajordom
< Tsas
377,378c373
< #HReceived: $?sfrom $s $.$?_($?s$|from $.$_) $.by $j ($v/$Z)$?r with $r$. id $i$?u for $u$.; $b
< HReceived: $?sfrom $s $.$?_($?s$|from $.$_) $.by $j ($v/$Z)$?r with $r$. id $i$?u; $b
---
> HReceived: $?sfrom $s $.$?_($?s$|from $.$_) $.by $j ($v/$Z)$?r with $r$. id $i$?u for $u$.; $b
443a439,443
> # convert old-style addresses to a domain-based address
> R$- ! $+		$@ $>96 $2 < @ $1 .UUCP >	resolve uucp names
> R$+ . $- ! $+		$@ $>96 $3 < @ $1 . $2 >		domain uucps
> R$+ ! $+		$@ $>96 $2 < @ $1 .UUCP >	uucp subdomains
> 
461a462
> R$* < @ localhost . UUCP > $*	$: $1 < @ $j . > $2		.UUCP domain
463c464
< R$* < @@ $=v > $*		$: $1 < @ $j . > $3		self-literal
---
> R$* < @@ $=w > $*		$: $1 < @ $j . > $3		self-literal
469a471,476
> # if really UUCP, handle it immediately
> 
> # try UUCP traffic as a local address
> R$* < @ $+ . UUCP > $*		$: $1 < @ $[ $2 $] . UUCP . > $3
> R$* < @ $+ . . UUCP . > $*		$@ $1 < @ $2 . > $3
> 
474c481
< R$* < @ $=v > $*		$: $1 < @ $2 . > $3
---
> R$* < @ $=w > $*		$: $1 < @ $2 . > $3
499a507,508
> # UUCP must always be presented in old form
> R$+ @ $- . UUCP		$2!$1				u@h.UUCP => h!u
502c511
< R$+ % $=v @ $=v		$1 @ $j				u%host@host => u@host
---
> R$+ % $=w @ $=w		$1 @ $j				u%host@host => u@host
534,536c543,545
< R< @ $=v . > : $*	$@ $>97 $2		@here:... -> ...
< R$- < @ $=v . >		$: $(dequote $1 $) < @ $2 . >	dequote "foo"@here
< R$* $=O $* < @ $=v . >	$@ $>97 $1 $2 $3		...@here -> ...
---
> R< @ $=w . > : $*	$@ $>97 $2		@here:... -> ...
> R$- < @ $=w . >		$: $(dequote $1 $) < @ $2 . >	dequote "foo"@here
> R$* $=O $* < @ $=w . >	$@ $>97 $1 $2 $3		...@here -> ...
541,570d549
< # multi-domain hackery, courtesy of mikeh (blame him if it breaks
< # anything) :)
< # DEPRECIATED! Use /etc/vmail/vmail.aliases instead.
< # See /etc/vmail/README.TXT
< #R$+       < @ $* chicken . org . >        	$#local $@ $:brett
< #R$+       < @ $* fizbat . net . >         	$#local $@ $:brett
< #R$+       < @ $* puzzletts . com . >      	$#local $@ $:$1.puzzletts
< ##Rinfo      < @ $* blankies . com . >       	$#local $@ $:helen
< ##Rbrian     < @ $* brian-patti . com . >    	$#local $@ $:brian1
< ##Rinfo      < @ $* cherryprod . com . >     	$#local $@ $:teri
< ##R$+        < @ $* cogo . com . >           	$#local $@ $:cogo
< ##R$+        < @ $* cogo . org . >           	$#local $@ $:cogo
< ##Rcrux      < @ $* cruxpert . com . >       	$#local $@ $:netxpert
< ##Rsheri     < @ $* jaznjaz . com . >        	$#local $@ $:sheri1
< ##Rwebmaster < @ $* jsrunderworld . com . >  	$#local $@ $:jsrunderworld
< ##Rsales     < @ $* lodgepole . com . >      	$#local $@ $:lodgepolesales
< R$+        < @ $* lunaroutreach . org . >  	$#local $@ $:$1.lunaroutreach.org
< ##Rmark      < @ $* pilgrim . org . >        	$#local $@ $:mark1
< ##Rsabrina   < @ $* pilgrim . org . >        	$#local $@ $:sabrina1
< ##Rarchive   < @ $* pulpfiction . com . >    	$#local $@ $:pulpfiction-archive
< ##Rmail      < @ $* sasquatchbooks . com . > 	$#local $@ $:books
< ##Rinfo      < @ $* seawave . com . >       	$#local $@ $:hiroaki
< ##Rsales     < @ $* seawave . com . >           $#local $@ $:hiroaki
< ##Ryac       < @ $* seawave . com . >         	$#local $@ $:hiroaki
< ##Rinfo      < @ $* skiclip . com . >        	$#local $@ $:skiclip
< ##Rorder     < @ $* skiclip . com . >        	$#local $@ $:skiclip
< ##Rbrian     < @ $* strictly-hiphop . com . >	$#local $@ $:brianw
< ##Remail     < @ $* xxxenophile . com . >    	$#local $@ $:bojar
< ##Rmail      < @ $* xxxenophile . com . >    	$#local $@ $:bojar
< 
572,577c551,552
< R$=L < @ $=v . >	$#local $: @ $1		special local names
< R$+ < @ $=v . >		$#local $: $1			regular local name
< 
< # virtual hack!
< 
< #R$+ < @ $* $=V . >			$: $#lo$(virtual $1@$3$)
---
> R$=L < @ $=w . >	$#local $: @ $1		special local names
> R$+ < @ $=w . >		$#local $: $1			regular local name
586a562
> # resolve remotely connected UUCP links (if any)
654c630
< R< $=v > $*		$@ $2				delete local host
---
> R< $=w > $*		$@ $2				delete local host
664c640
< R$=E < @ $=v . >	$@ $1 < @ $2 . >
---
> R$=E < @ $=w . >	$@ $1 < @ $2 . >
666c642
< R$* < @ $=v . > $*	$: $1 < @ $2 . @ $M > $3
---
> R$* < @ $=w . > $*	$: $1 < @ $2 . @ $M > $3
684,691d659
< # Virtual mail domains - RJL20
< R$+ < @ $+ . >		$: $1 < @ $2 > .
< R$+ < @ $+ > $*		$: $(maildomains $1@$2 $: $1 < @ $2 > $3 $)
< R$+ < @ $+ > $*		$: $(maildomains $2 $: $1 < @ $2 > $3 $)
< R$+ < @ $+ > .		$: $1 < @ $2 . >
< 
< # Remove www from www.pyramidbrew.com -RJL20
< R$+ < @ www . pyramidbrew . com . >	$: $1 < @ pyramidbrew . com . >
692a661,664
> # addresses sent to foo@host.REDIRECT will give a 551 error code
> R$* < @ $+ .REDIRECT. >		$: $1 < @ $2 . REDIRECT . > < ${opMode} >
> R$* < @ $+ .REDIRECT. > <i>	$: $1 < @ $2 . REDIRECT. >
> R$* < @ $+ .REDIRECT. > < $- >	$# error $@ 5.1.1 $: "551 User not local; please try " <$1@$2>
812a785,794
> 
> # do UUCP heuristics; note that these are shared with UUCP mailers
> R$+ < @ $+ .UUCP. >	$: < $2 ! > $1			convert to UUCP form
> R$+ < @ $* > $*		$@ $1 < @ $2 > $3		not UUCP form
> 
> # leave these in .UUCP form to avoid further tampering
> R< $&h ! > $- ! $+	$@ $2 < @ $1 .UUCP. >
> R< $&h ! > $-.$+ ! $+	$@ $3 < @ $1.$2 >
> R< $&h ! > $+		$@ $1 < @ $&h .UUCP. >
> R< $+ ! > $+		$: $1 ! $2 < @ *LOCAL* >
