SCCS-vsn: usr.sbin/sendmail/cf/m4/proto.m4 8.23
SCCS-vsn: usr.sbin/sendmail/cf/feature/bitdomain.m4 8.4
SCCS-vsn: usr.sbin/sendmail/cf/feature/uucpdomain.m4 8.4
SCCS-vsn: usr.sbin/sendmail/cf/mailer/smtp.m4 8.9
SCCS-vsn: usr.sbin/sendmail/cf/mailer/uucp.m4 8.8
-VERSIONID(`@(#)bitdomain.m4 8.3 (Berkeley) %G%')
+VERSIONID(`@(#)bitdomain.m4 8.4 (Berkeley) %G%')
PUSHDIVERT(8)
# handle BITNET mapping
PUSHDIVERT(8)
# handle BITNET mapping
-R$* < @ $+ .BITNET > $* $: $1 < @ $(bitdomain $2 $: $2.BITNET $) > $3
+R$* < @ $+ .BITNET. > $* $: $1 < @ $(bitdomain $2 $: $2.BITNET. $) > $3
-VERSIONID(`@(#)uucpdomain.m4 8.3 (Berkeley) %G%')
+VERSIONID(`@(#)uucpdomain.m4 8.4 (Berkeley) %G%')
PUSHDIVERT(8)
# handle UUCP mapping
PUSHDIVERT(8)
# handle UUCP mapping
-R$* < @ $+ .UUCP > $* $: $1 < @ $(uudomain $2 $: $2.UUCP $) > $3
+R$* < @ $+ .UUCP. > $* $: $1 < @ $(uudomain $2 $: $2.UUCP. $) > $3
-VERSIONID(`@(#)proto.m4 8.22 (Berkeley) %G%')
+VERSIONID(`@(#)proto.m4 8.23 (Berkeley) %G%')
ifdef(`_NO_UUCP_', `dnl',
`ifdef(`UUCP_RELAY',
`# pass UUCP addresses straight through
ifdef(`_NO_UUCP_', `dnl',
`ifdef(`UUCP_RELAY',
`# pass UUCP addresses straight through
-R$* < @ $+ . UUCP > $* $@ $1 < @ $2 . UUCP > $3',
+R$* < @ $+ . UUCP > $* $@ $1 < @ $2 . UUCP . > $3',
`# if really UUCP, handle it immediately
ifdef(`_CLASS_U_',
`# if really UUCP, handle it immediately
ifdef(`_CLASS_U_',
-`R$* < @ $=U . UUCP > $* $@ $1 < @ $2 . UUCP > $3', `dnl')
+`R$* < @ $=U . UUCP > $* $@ $1 < @ $2 . UUCP . > $3', `dnl')
-`R$* < @ $=V . UUCP > $* $@ $1 < @ $2 . UUCP > $3', `dnl')
+`R$* < @ $=V . UUCP > $* $@ $1 < @ $2 . UUCP . > $3', `dnl')
-`R$* < @ $=W . UUCP > $* $@ $1 < @ $2 . UUCP > $3', `dnl')
+`R$* < @ $=W . UUCP > $* $@ $1 < @ $2 . UUCP . > $3', `dnl')
-`R$* < @ $=X . UUCP > $* $@ $1 < @ $2 . UUCP > $3', `dnl')
+`R$* < @ $=X . UUCP > $* $@ $1 < @ $2 . UUCP . > $3', `dnl')
-`R$* < @ $=Y . UUCP > $* $@ $1 < @ $2 . UUCP > $3', `dnl')
+`R$* < @ $=Y . UUCP > $* $@ $1 < @ $2 . UUCP . > $3', `dnl')
# try UUCP traffic as a local address
# try UUCP traffic as a local address
-R$* < @ $+ . UUCP > $* $: $1 < @ $[ $2 $] . UUCP > $3
+R$* < @ $+ . UUCP > $* $: $1 < @ $[ $2 $] . UUCP . > $3
-`R$* < @ $+ . $+ . UUCP > $* $@ $1 < @ $2 . $3 . > $4',
-`R$* < @ $+ . . UUCP > $* $@ $1 < @ $2 . > $3')')
+`R$* < @ $+ . $+ . UUCP . > $* $@ $1 < @ $2 . $3 . > $4',
+`R$* < @ $+ . . UUCP . > $* $@ $1 < @ $2 . > $3')')
')
ifdef(`_NO_CANONIFY_',
`# make sure local host names appear canonical
')
ifdef(`_NO_CANONIFY_',
`# make sure local host names appear canonical
`# pass to name server to make hostname canonical
R$* < @ $* $~P > $* $: $1 < @ $[ $2 $3 $] > $4')
`# pass to name server to make hostname canonical
R$* < @ $* $~P > $* $: $1 < @ $[ $2 $3 $] > $4')
+# pseudo-domains are always canonical
+R$* < @ $* $=P > $* $: $1 < @ $2 $3 . > $4
+R$* < @ $* . . > $* $: $1 < @ $2 . > $3
+
undivert(8)dnl
# if this is the local hostname, make sure we treat is as canonical
undivert(8)dnl
# if this is the local hostname, make sure we treat is as canonical
ifdef(`_LOCAL_NOT_STICKY_',
`R$=L < @ $=w . > $#_LOCAL_ $: @ $1 special local names
R$+ < @ $=w . > $#_LOCAL_ $: $1 dispose directly',
ifdef(`_LOCAL_NOT_STICKY_',
`R$=L < @ $=w . > $#_LOCAL_ $: @ $1 special local names
R$+ < @ $=w . > $#_LOCAL_ $: $1 dispose directly',
-`R$+ < @ $=w . > $: $1 < @ $2 @ $H > first try hub
+`R$+ < @ $=w . > $: $1 < @ $2 . @ $H > first try hub
ifdef(`_OLD_SENDMAIL_',
`R$+ < $+ @ $-:$+ > $# $3 $@ $4 $: $1 $2 yep ....
R$+ < $+ @ $+ > $#relay $@ $3 $: $1 $2 yep ....
ifdef(`_OLD_SENDMAIL_',
`R$+ < $+ @ $-:$+ > $# $3 $@ $4 $: $1 $2 yep ....
R$+ < $+ @ $+ > $#relay $@ $3 $: $1 $2 yep ....
`R$*<@$+.CSNET>$* $#smtp $@ $C $: $1 @ $2 . CSNET $3 user@host.CSNET',
`dnl')
ifdef(`_MAILER_fax_',
`R$*<@$+.CSNET>$* $#smtp $@ $C $: $1 @ $2 . CSNET $3 user@host.CSNET',
`dnl')
ifdef(`_MAILER_fax_',
-`R$+ < @ $+ .FAX > $#fax $@ $2 $: $1 user@host.FAX',
+`R$+ < @ $+ .FAX. > $#fax $@ $2 $: $1 user@host.FAX',
`ifdef(`FAX_RELAY',
`R$*<@$+.FAX>$* $#smtp $@ $F $: $1 @ $2 . FAX $3 user@host.FAX',
`dnl')')
`ifdef(`FAX_RELAY',
`R$*<@$+.FAX>$* $#smtp $@ $F $: $1 @ $2 . FAX $3 user@host.FAX',
`dnl')')
R$*<@$*.UUCP>$* $#smtp $@ $Y $: @ $Y : $1 @ $2.UUCP $3 uucp mail',
`ifdef(`_MAILER_uucp_',
`# forward other UUCP traffic straight to UUCP
R$*<@$*.UUCP>$* $#smtp $@ $Y $: @ $Y : $1 @ $2.UUCP $3 uucp mail',
`ifdef(`_MAILER_uucp_',
`# forward other UUCP traffic straight to UUCP
-R< @ $+ .UUCP > : $+ $#uucp $@ $1 $: $2 @host.UUCP:...
-R$+ < @ $+ .UUCP > $#uucp $@ $2 $: $1 user@host.UUCP',
+R< @ $+ .UUCP. > : $+ $#uucp $@ $1 $: $2 @host.UUCP:...
+R$+ < @ $+ .UUCP. > $#uucp $@ $2 $: $1 user@host.UUCP',
`dnl')')
ifdef(`_MAILER_usenet_', `
# addresses sent to net.group.USENET will get forwarded to a newsgroup
`dnl')')
ifdef(`_MAILER_usenet_', `
# addresses sent to net.group.USENET will get forwarded to a newsgroup
-R$+ . USENET $#usenet $: $1',
+R$+ . USENET. $#usenet $: $1',
`dnl')
ifdef(`_LOCAL_RULES_',
`dnl')
ifdef(`_LOCAL_RULES_',
### SMTP Mailer specification ###
#####################################
### SMTP Mailer specification ###
#####################################
-VERSIONID(`@(#)smtp.m4 8.8 (Berkeley) %G%')
+VERSIONID(`@(#)smtp.m4 8.9 (Berkeley) %G%')
Msmtp, P=[IPC], F=CONCAT(mDFMuX, SMTP_MAILER_FLAGS), S=11/31, R=ifdef(`_ALL_MASQUERADE_', `11/31', `21'), E=\r\n,
ifdef(`_OLD_SENDMAIL_',, `L=990, ')A=IPC $h
Msmtp, P=[IPC], F=CONCAT(mDFMuX, SMTP_MAILER_FLAGS), S=11/31, R=ifdef(`_ALL_MASQUERADE_', `11/31', `21'), E=\r\n,
ifdef(`_OLD_SENDMAIL_',, `L=990, ')A=IPC $h
# output fake domains as user%fake@relay
ifdef(`BITNET_RELAY',
# output fake domains as user%fake@relay
ifdef(`BITNET_RELAY',
-`R$+ <@ $+ . BITNET > $: $1 % $2 .BITNET < @ $B > user@host.BITNET
-R$+.BITNET <@ $+:$+ > $: $1 .BITNET < @ $3 > strip mailer: part',
+`R$+ <@ $+ .BITNET. > $: $1 % $2 .BITNET. < @ $B > user@host.BITNET
+R$+.BITNET. <@ $+:$+ > $: $1 .BITNET. < @ $3 > strip mailer: part',
`dnl')
ifdef(`CSNET_RELAY',
`dnl')
ifdef(`CSNET_RELAY',
-`R$+ <@ $+ . CSNET > $: $1 % $2 .CSNET < @ $C > user@host.CSNET
-R$+.CSNET <@ $+:$+ > $: $1 .CSNET < @ $3 > strip mailer: part',
+`R$+ <@ $+ .CSNET. > $: $1 % $2 .CSNET. < @ $C > user@host.CSNET
+R$+.CSNET. <@ $+:$+ > $: $1 .CSNET. < @ $3 > strip mailer: part',
`dnl')
ifdef(`_NO_UUCP_', `dnl',
`dnl')
ifdef(`_NO_UUCP_', `dnl',
-`R$+ <@ $+ . UUCP > $: $2 ! $1 < @ $j > user@host.UUCP')
+`R$+ <@ $+ .UUCP. > $: $2 ! $1 < @ $j > user@host.UUCP')
### UUCP Mailer specification ###
#####################################
### UUCP Mailer specification ###
#####################################
-VERSIONID(`@(#)uucp.m4 8.7 (Berkeley) %G%')
+VERSIONID(`@(#)uucp.m4 8.8 (Berkeley) %G%')
# old UUCP mailer
Muucp, P=UUCP_MAILER_PATH, F=CONCAT(DFMhuU, UUCP_MAILER_FLAGS), S=12, R=22, M=UUCP_MAX_SIZE,
# old UUCP mailer
Muucp, P=UUCP_MAILER_PATH, F=CONCAT(DFMhuU, UUCP_MAILER_FLAGS), S=12, R=22, M=UUCP_MAX_SIZE,
R$* :; <@> $@ $1 :;
R$* < @ $* . > $1 < @ $2 > strip trailing dots
R$* :; <@> $@ $1 :;
R$* < @ $* . > $1 < @ $2 > strip trailing dots
-R$* < @ $j > $1 strip local name
+R$* < @ $=w > $1 strip local name
R$* < @ $- . UUCP > $2 ! $1 convert to UUCP format
R$* < @ $+ > $2 ! $1 convert to UUCP format
R$+ $: $U ! $1 prepend our name
R$* < @ $- . UUCP > $2 ! $1 convert to UUCP format
R$* < @ $+ > $2 ! $1 convert to UUCP format
R$+ $: $U ! $1 prepend our name
PUSHDIVERT(4)
# resolve locally connected UUCP links
PUSHDIVERT(4)
# resolve locally connected UUCP links
-R< @ $=Z . UUCP > : $+ $#uucp-dom $@ $1 $: $2 @host.UUCP: ...
-R$+ < @ $=Z . UUCP > $#uucp-dom $@ $2 $: $1 user@host.UUCP
-R< @ $=Y . UUCP > : $+ $#suucp $@ $1 $: $2 @host.UUCP: ...
-R$+ < @ $=Y . UUCP > $#suucp $@ $2 $: $1 user@host.UUCP
-R< @ $=U . UUCP > : $+ $#uucp $@ $1 $: $2 @host.UUCP: ...
-R$+ < @ $=U . UUCP > $#uucp $@ $2 $: $1 user@host.UUCP
+R< @ $=Z . UUCP. > : $+ $#uucp-dom $@ $1 $: $2 @host.UUCP: ...
+R$+ < @ $=Z . UUCP. > $#uucp-dom $@ $2 $: $1 user@host.UUCP
+R< @ $=Y . UUCP. > : $+ $#suucp $@ $1 $: $2 @host.UUCP: ...
+R$+ < @ $=Y . UUCP. > $#suucp $@ $2 $: $1 user@host.UUCP
+R< @ $=U . UUCP. > : $+ $#uucp $@ $1 $: $2 @host.UUCP: ...
+R$+ < @ $=U . UUCP. > $#uucp $@ $2 $: $1 user@host.UUCP