diff options
Diffstat (limited to 'contrib/sendmail/cf/mailer/local.m4')
| -rw-r--r-- | contrib/sendmail/cf/mailer/local.m4 | 61 |
1 files changed, 36 insertions, 25 deletions
diff --git a/contrib/sendmail/cf/mailer/local.m4 b/contrib/sendmail/cf/mailer/local.m4 index 6b4b679..6b14b19 100644 --- a/contrib/sendmail/cf/mailer/local.m4 +++ b/contrib/sendmail/cf/mailer/local.m4 @@ -1,6 +1,7 @@ PUSHDIVERT(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -10,10 +11,13 @@ PUSHDIVERT(-1) # the sendmail distribution. # # -ifdef(`LOCAL_MAILER_FLAGS',, `define(`LOCAL_MAILER_FLAGS', `rmn9')') +_DEFIFNOT(`_DEF_LOCAL_MAILER_FLAGS', `lsDFMAw5:/|@q') +_DEFIFNOT(`LOCAL_MAILER_FLAGS', `Prmn9') ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /bin/mail)') ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail -d $u')') -ifdef(`LOCAL_SHELL_FLAGS',, `define(`LOCAL_SHELL_FLAGS', `eu9')') +ifdef(`LOCAL_MAILER_DSN_DIAGNOSTIC_CODE',, `define(`LOCAL_MAILER_DSN_DIAGNOSTIC_CODE', `X-Unix')') +_DEFIFNOT(`_DEF_LOCAL_SHELL_FLAGS', `lsDFMoq') +_DEFIFNOT(`LOCAL_SHELL_FLAGS', `eu9') ifdef(`LOCAL_SHELL_PATH',, `define(`LOCAL_SHELL_PATH', /bin/sh)') ifdef(`LOCAL_SHELL_ARGS',, `define(`LOCAL_SHELL_ARGS', `sh -c $u')') ifdef(`LOCAL_SHELL_DIR',, `define(`LOCAL_SHELL_DIR', `$z:/')') @@ -23,52 +27,59 @@ POPDIVERT ### Local and Program Mailer specification ### ################################################## -VERSIONID(`@(#)local.m4 8.30 (Berkeley) 6/30/1998') - -Mlocal, P=LOCAL_MAILER_PATH, F=CONCAT(`lsDFMAw5:/|@q', LOCAL_MAILER_FLAGS), S=10/30, R=20/40, - _OPTINS(`LOCAL_MAILER_MAX', `M=', `, ')_OPTINS(`LOCAL_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/X-Unix, - A=LOCAL_MAILER_ARGS -Mprog, P=LOCAL_SHELL_PATH, F=CONCAT(`lsDFMoq', LOCAL_SHELL_FLAGS), S=10/30, R=20/40, D=LOCAL_SHELL_DIR, - _OPTINS(`LOCAL_MAILER_MAX', `M=', `, ')T=X-Unix, - A=LOCAL_SHELL_ARGS +VERSIONID(`$Id: local.m4,v 8.50.16.1 2000/06/12 18:25:40 gshapiro Exp $') # # Envelope sender rewriting # -S10 +SEnvFromL=10 R<@> $n errors to mailer-daemon R@ <@ $*> $n temporarily bypass Sun bogosity -R$+ $: $>50 $1 add local domain if needed -R$* $: $>94 $1 do masquerading +R$+ $: $>AddDomain $1 add local domain if needed +R$* $: $>MasqEnv $1 do masquerading # # Envelope recipient rewriting # -S20 +SEnvToL=20 R$+ < @ $* > $: $1 strip host part +ifdef(`_FFR_ADDR_TYPE', `dnl +ifdef(`confUSERDB_SPEC', `dnl', +`dnl Do not forget to bump V9 to V10 before removing _FFR_ADDR_TYPE check +R$+ + $* $: < $&{addr_type} > $1 + $2 mark with addr type +R<e s> $+ + $* $: $1 remove +detail for sender +R< $* > $+ $: $2 else remove mark')', `dnl') # # Header sender rewriting # -S30 +SHdrFromL=30 R<@> $n errors to mailer-daemon R@ <@ $*> $n temporarily bypass Sun bogosity -R$+ $: $>50 $1 add local domain if needed -R$* $: $>93 $1 do masquerading +R$+ $: $>AddDomain $1 add local domain if needed +R$* $: $>MasqHdr $1 do masquerading # # Header recipient rewriting # -S40 -R$+ $: $>50 $1 add local domain if needed -ifdef(`_ALL_MASQUERADE_', `dnl -R$* $: $>93 $1 do all-masquerading', `dnl') +SHdrToL=40 +R$+ $: $>AddDomain $1 add local domain if needed +ifdef(`_ALL_MASQUERADE_', +`R$* $: $>MasqHdr $1 do all-masquerading', +`R$* < @ *LOCAL* > $* $: $1 < @ $j . > $2') # # Common code to add local domain name (only if always-add-domain) # -S50 +SAddDomain=50 ifdef(`_ALWAYS_ADD_DOMAIN_', `dnl -R$* < @ $* > $* $@ $1 < @ $2 > $3 already fully qualified -R$+ $@ $1 < @ *LOCAL* > add local qualification', +R$* < @ $* > $* $@ $1 < @ $2 > $3 already fully qualified +R$+ $@ $1 < @ *LOCAL* > add local qualification', `dnl') + +Mlocal, P=LOCAL_MAILER_PATH, F=_MODMF_(CONCAT(_DEF_LOCAL_MAILER_FLAGS, LOCAL_MAILER_FLAGS), `LOCAL'), S=EnvFromL/HdrFromL, R=EnvToL/HdrToL,_OPTINS(`LOCAL_MAILER_EOL', ` E=', `, ') + _OPTINS(`LOCAL_MAILER_MAX', `M=', `, ')_OPTINS(`LOCAL_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`LOCAL_MAILER_MAXRCPTS', `r=', `, ')_OPTINS(`LOCAL_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/LOCAL_MAILER_DSN_DIAGNOSTIC_CODE, + A=LOCAL_MAILER_ARGS +Mprog, P=LOCAL_SHELL_PATH, F=CONCAT(_DEF_LOCAL_SHELL_FLAGS, LOCAL_SHELL_FLAGS), S=EnvFromL/HdrFromL, R=EnvToL/HdrToL, D=LOCAL_SHELL_DIR, + _OPTINS(`LOCAL_MAILER_MAX', `M=', `, ')T=X-Unix/X-Unix/X-Unix, + A=LOCAL_SHELL_ARGS |
