diff options
Diffstat (limited to 'usr.sbin/sendmail/cf/mailer/uucp.m4')
| -rw-r--r-- | usr.sbin/sendmail/cf/mailer/uucp.m4 | 64 |
1 files changed, 33 insertions, 31 deletions
diff --git a/usr.sbin/sendmail/cf/mailer/uucp.m4 b/usr.sbin/sendmail/cf/mailer/uucp.m4 index dd7aa87..0b65949 100644 --- a/usr.sbin/sendmail/cf/mailer/uucp.m4 +++ b/usr.sbin/sendmail/cf/mailer/uucp.m4 @@ -34,15 +34,17 @@ PUSHDIVERT(-1) # ifdef(`UUCP_MAILER_PATH',, `define(`UUCP_MAILER_PATH', /usr/bin/uux)') -ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -a$f -gC $h!rmail ($u)')') +ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -a$g -gC $h!rmail ($u)')') ifdef(`UUCP_MAILER_FLAGS',, `define(`UUCP_MAILER_FLAGS', `')') -ifdef(`UUCP_MAX_SIZE',, `define(`UUCP_MAX_SIZE', 100000)') +ifdef(`UUCP_MAILER_MAX',, + `define(`UUCP_MAILER_MAX', + `ifdef(`UUCP_MAX_SIZE', `UUCP_MAX_SIZE', 100000)')') POPDIVERT ##################################### ### UUCP Mailer specification ### ##################################### -VERSIONID(`@(#)uucp.m4 8.16 (Berkeley) 4/14/94') +VERSIONID(`@(#)uucp.m4 8.24 (Berkeley) 9/5/95') # # There are innumerable variations on the UUCP mailer. It really @@ -50,24 +52,30 @@ VERSIONID(`@(#)uucp.m4 8.16 (Berkeley) 4/14/94') # # old UUCP mailer (two names) -Muucp, P=UUCP_MAILER_PATH, F=CONCAT(DFMhuU, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAX_SIZE, +Muucp, P=UUCP_MAILER_PATH, F=CONCAT(DFMhuUd, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAILER_MAX, + _OPTINS(`UUCP_MAILER_CHARSET', `C=', `, ')T=X-UUCP/X-UUCP/X-Unix, A=UUCP_MAILER_ARGS -Muucp-old, P=UUCP_MAILER_PATH, F=CONCAT(DFMhuU, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAX_SIZE, +Muucp-old, P=UUCP_MAILER_PATH, F=CONCAT(DFMhuUd, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAILER_MAX, + _OPTINS(`UUCP_MAILER_CHARSET', `C=', `, ')T=X-UUCP/X-UUCP/X-Unix, A=UUCP_MAILER_ARGS # smart UUCP mailer (handles multiple addresses) (two names) -Msuucp, P=UUCP_MAILER_PATH, F=CONCAT(mDFMhuU, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAX_SIZE, +Msuucp, P=UUCP_MAILER_PATH, F=CONCAT(mDFMhuUd, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAILER_MAX, + _OPTINS(`UUCP_MAILER_CHARSET', `C=', `, ')T=X-UUCP/X-UUCP/X-Unix, A=UUCP_MAILER_ARGS -Muucp-new, P=UUCP_MAILER_PATH, F=CONCAT(mDFMhuU, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAX_SIZE, +Muucp-new, P=UUCP_MAILER_PATH, F=CONCAT(mDFMhuUd, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAILER_MAX, + _OPTINS(`UUCP_MAILER_CHARSET', `C=', `, ')T=X-UUCP/X-UUCP/X-Unix, A=UUCP_MAILER_ARGS ifdef(`_MAILER_smtp_', `# domain-ized UUCP mailer -Muucp-dom, P=UUCP_MAILER_PATH, F=CONCAT(mDFMhu, UUCP_MAILER_FLAGS), S=52/31, R=ifdef(`_ALL_MASQUERADE_', `11/31', `21'), M=UUCP_MAX_SIZE, +Muucp-dom, P=UUCP_MAILER_PATH, F=CONCAT(mDFMhud, UUCP_MAILER_FLAGS), S=52/31, R=ifdef(`_ALL_MASQUERADE_', `21/31', `21'), M=UUCP_MAILER_MAX, + _OPTINS(`UUCP_MAILER_CHARSET', `C=', `, ')T=X-UUCP/X-UUCP/X-Unix, A=UUCP_MAILER_ARGS # domain-ized UUCP mailer with UUCP-style sender envelope -Muucp-uudom, P=UUCP_MAILER_PATH, F=CONCAT(mDFMhu, UUCP_MAILER_FLAGS), S=72/31, R=ifdef(`_ALL_MASQUERADE_', `11/31', `21'), M=UUCP_MAX_SIZE, +Muucp-uudom, P=UUCP_MAILER_PATH, F=CONCAT(mDFMhud, UUCP_MAILER_FLAGS), S=72/31, R=ifdef(`_ALL_MASQUERADE_', `21/31', `21'), M=UUCP_MAILER_MAX, + _OPTINS(`UUCP_MAILER_CHARSET', `C=', `, ')T=X-UUCP/X-UUCP/X-Unix, A=UUCP_MAILER_ARGS') @@ -79,10 +87,10 @@ S12 # handle error address as a special case R<@> $n errors to mailer-daemon -# do not qualify list:; syntax -R$* :; <@> $@ $1 :; +# list:; syntax should disappear +R:; <@> $@ -R$* < @ $* . > $1 < @ $2 > strip trailing dots +R$* < @ $* . > $* $1 < @ $2 > $3 strip trailing dots R$* < @ $=w > $1 strip local name R<@ $- . UUCP > : $+ $1 ! $2 convert to UUCP format R<@ $+ > : $+ $1 ! $2 convert to UUCP format @@ -98,10 +106,10 @@ R! $+ $: $k ! $1 in case $U undefined # S22 -# don't touch list:; syntax -R$* :; <@> $@ $1 :; +# list:; should disappear +R:; <@> $@ -R$* < @ $* . > $1 < @ $2 > strip trailing dots +R$* < @ $* . > $* $1 < @ $2 > $3 strip trailing dots R$* < @ $j > $1 strip local name R<@ $- . UUCP > : $+ $1 ! $2 convert to UUCP format R<@ $+ > : $+ $1 ! $2 convert to UUCP format @@ -113,10 +121,10 @@ R$* < @ $+ > $2 ! $1 convert to UUCP format # S42 -# don't touch list:; syntax -R$* :; <@> $@ $1 :; +# list:; syntax should disappear +R:; <@> $@ -R$* < @ $* . > $1 < @ $2 > strip trailing dots +R$* < @ $* . > $* $1 < @ $2 > $3 strip trailing dots R$* < @ $j > $1 strip local name R<@ $- . UUCP > : $+ $1 ! $2 convert to UUCP format R<@ $+ > : $+ $1 ! $2 convert to UUCP format @@ -148,20 +156,14 @@ S72 # handle error address as a special case R<@> $n errors to mailer-daemon -# do not qualify list:; syntax -R$* :; <@> $@ $1 :; +# do standard SMTP mailer rewriting +R$* $: $>11 $1 -R$* < @ $* . > $1 < @ $2 > strip trailing dots -R$* < @ $=w > $1 strip local name -R<@ $- . UUCP > : $+ $1 ! $2 convert to UUCP format -R<@ $+ > : $+ $1 ! $2 convert to UUCP format -R$* < @ $- . UUCP > $2 ! $1 convert to UUCP format -R$* < @ $+ > $@ $2 ! $1 convert to UUCP format - -R$&h ! $+ ! $+ $@ $1 ! $2 $h!...!user => ...!user -R$&h ! $+ $@ $&h ! $1 $h!user => $h!user -R$+ $: $M ! $1 prepend masquerade name -R! $+ $: $j ! $1 in case $M undefined') +R$* < @ $* . > $* $1 < @ $2 > $3 strip trailing dots +R<@ $- . UUCP > : $+ $@ $1 ! $2 convert to UUCP format +R<@ $+ > : $+ $@ $1 ! $2 convert to UUCP format +R$* < @ $- . UUCP > $@ $2 ! $1 convert to UUCP format +R$* < @ $+ > $@ $2 ! $1 convert to UUCP format') PUSHDIVERT(4) |
