diff options
Diffstat (limited to 'contrib/sendmail/cf/mailer')
| -rw-r--r-- | contrib/sendmail/cf/mailer/cyrus.m4 | 36 | ||||
| -rw-r--r-- | contrib/sendmail/cf/mailer/fax.m4 | 8 | ||||
| -rw-r--r-- | contrib/sendmail/cf/mailer/local.m4 | 61 | ||||
| -rw-r--r-- | contrib/sendmail/cf/mailer/mail11.m4 | 20 | ||||
| -rw-r--r-- | contrib/sendmail/cf/mailer/phquery.m4 | 13 | ||||
| -rw-r--r-- | contrib/sendmail/cf/mailer/pop.m4 | 13 | ||||
| -rw-r--r-- | contrib/sendmail/cf/mailer/procmail.m4 | 16 | ||||
| -rw-r--r-- | contrib/sendmail/cf/mailer/qpage.m4 | 30 | ||||
| -rw-r--r-- | contrib/sendmail/cf/mailer/smtp.m4 | 122 | ||||
| -rw-r--r-- | contrib/sendmail/cf/mailer/usenet.m4 | 12 | ||||
| -rw-r--r-- | contrib/sendmail/cf/mailer/uucp.m4 | 90 |
11 files changed, 247 insertions, 174 deletions
diff --git a/contrib/sendmail/cf/mailer/cyrus.m4 b/contrib/sendmail/cf/mailer/cyrus.m4 index 567025f..a6afa4a 100644 --- a/contrib/sendmail/cf/mailer/cyrus.m4 +++ b/contrib/sendmail/cf/mailer/cyrus.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. # # 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 @@ -12,17 +13,17 @@ PUSHDIVERT(-1) # #*************************************************************************** # (C) Copyright 1995 by Carnegie Mellon University -# +# # All Rights Reserved -# -# Permission to use, copy, modify, and distribute this software and its -# documentation for any purpose and without fee is hereby granted, +# +# Permission to use, copy, modify, and distribute this software and its +# documentation for any purpose and without fee is hereby granted, # provided that the above copyright notice appear in all copies and that -# both that copyright notice and this permission notice appear in +# both that copyright notice and this permission notice appear in # supporting documentation, and that the name of CMU not be # used in advertising or publicity pertaining to distribution of the -# software without specific, written prior permission. -# +# software without specific, written prior permission. +# # CMU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING # ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL # CMU BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR @@ -32,13 +33,16 @@ PUSHDIVERT(-1) # SOFTWARE. # # Contributed to Berkeley by John Gardiner Myers <jgm+@CMU.EDU>. -# +# + +ifdef(`_MAILER_local_', `', + `errprint(`*** MAILER(`local') must appear before MAILER(`cyrus')')')dnl -ifdef(`CYRUS_MAILER_FLAGS',, `define(`CYRUS_MAILER_FLAGS', `A5@/:|')') +_DEFIFNOT(`CYRUS_MAILER_FLAGS', `Ah5@/:|') ifdef(`CYRUS_MAILER_PATH',, `define(`CYRUS_MAILER_PATH', /usr/cyrus/bin/deliver)') ifdef(`CYRUS_MAILER_ARGS',, `define(`CYRUS_MAILER_ARGS', `deliver -e -m $h -- $u')') ifdef(`CYRUS_MAILER_USER',, `define(`CYRUS_MAILER_USER', `cyrus:mail')') -ifdef(`CYRUS_BB_MAILER_FLAGS',, `define(`CYRUS_BB_MAILER_FLAGS', `')') +_DEFIFNOT(`CYRUS_BB_MAILER_FLAGS', `u') ifdef(`CYRUS_BB_MAILER_ARGS',, `define(`CYRUS_BB_MAILER_ARGS', `deliver -e -m $u')') POPDIVERT @@ -47,12 +51,12 @@ POPDIVERT ### Cyrus Mailer specification ### ################################################## -VERSIONID(`@(#)cyrus.m4 8.9 (Carnegie Mellon) 5/19/1998') +VERSIONID(`$Id: cyrus.m4,v 8.21 1999/10/18 04:57:52 gshapiro Exp $ (Carnegie Mellon)') -Mcyrus, P=CYRUS_MAILER_PATH, F=CONCAT(`lsDFMnPq', CYRUS_MAILER_FLAGS), S=10, R=20/40, T=X-Unix, - ifdef(`CYRUS_MAILER_MAX', `M=CYRUS_MAILER_MAX, ')U=CYRUS_MAILER_USER, +Mcyrus, P=CYRUS_MAILER_PATH, F=_MODMF_(CONCAT(`lsDFMnPq', CYRUS_MAILER_FLAGS), `CYRUS'), S=EnvFromL, R=EnvToL/HdrToL, + ifdef(`CYRUS_MAILER_MAX', `M=CYRUS_MAILER_MAX, ')U=CYRUS_MAILER_USER, T=DNS/RFC822/X-Unix, A=CYRUS_MAILER_ARGS -Mcyrusbb, P=CYRUS_MAILER_PATH, F=CONCAT(`lsDFMnP', CYRUS_BB_MAILER_FLAGS), S=10, R=20/40, T=X-Unix, - ifdef(`CYRUS_MAILER_MAX', `M=CYRUS_MAILER_MAX, ')U=CYRUS_MAILER_USER, +Mcyrusbb, P=CYRUS_MAILER_PATH, F=_MODMF_(CONCAT(`lsDFMnP', CYRUS_BB_MAILER_FLAGS), `CYRUS'), S=EnvFromL, R=EnvToL/HdrToL, + ifdef(`CYRUS_MAILER_MAX', `M=CYRUS_MAILER_MAX, ')U=CYRUS_MAILER_USER, T=DNS/RFC822/X-Unix, A=CYRUS_BB_MAILER_ARGS diff --git a/contrib/sendmail/cf/mailer/fax.m4 b/contrib/sendmail/cf/mailer/fax.m4 index 3ee94bd..63c6931 100644 --- a/contrib/sendmail/cf/mailer/fax.m4 +++ b/contrib/sendmail/cf/mailer/fax.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. @@ -26,9 +27,10 @@ POPDIVERT ### FAX Mailer specification ### #################################### -VERSIONID(`@(#)fax.m4 8.11 (Berkeley) 5/19/1998') +VERSIONID(`$Id: fax.m4,v 8.15 1999/10/18 04:57:53 gshapiro Exp $') -Mfax, P=FAX_MAILER_PATH, F=DFMhu, S=14, R=24, M=FAX_MAILER_MAX, T=X-Phone/X-FAX/X-Unix, +Mfax, P=FAX_MAILER_PATH, F=DFMhu, S=14, R=24, + M=FAX_MAILER_MAX, T=X-Phone/X-FAX/X-Unix, A=FAX_MAILER_ARGS LOCAL_CONFIG 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 diff --git a/contrib/sendmail/cf/mailer/mail11.m4 b/contrib/sendmail/cf/mailer/mail11.m4 index 222b53f..d60a063 100644 --- a/contrib/sendmail/cf/mailer/mail11.m4 +++ b/contrib/sendmail/cf/mailer/mail11.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. # # 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 @@ -13,13 +14,13 @@ PUSHDIVERT(-1) # # This mailer is only useful if you have DECNET and the # mail11 program - gatekeeper.dec.com:/pub/DEC/gwtools. -# +# # For local delivery of DECNET style addresses to the local # DECNET node, you will need feature(use_cw_file) and put # your DECNET nodename in in the cw file. # ifdef(`MAIL11_MAILER_PATH',, `define(`MAIL11_MAILER_PATH', /usr/etc/mail11)') -ifdef(`MAIL11_MAILER_FLAGS',, `define(`MAIL11_MAILER_FLAGS', nsFx)') +_DEFIFNOT(`MAIL11_MAILER_FLAGS', `nsFx') ifdef(`MAIL11_MAILER_ARGS',, `define(`MAIL11_MAILER_ARGS', mail11 $g $x $h $u)') define(`_USE_DECNET_SYNTAX_') define(`_LOCAL_', ifdef(`confLOCAL_MAILER', confLOCAL_MAILER, `local')) @@ -40,19 +41,20 @@ POPDIVERT ### UTK-MAIL11 Mailer specification ### ########################################### -VERSIONID(`@(#)mail11.m4 8.8 (Berkeley) 5/19/1998') - -Mmail11, P=MAIL11_MAILER_PATH, F=MAIL11_MAILER_FLAGS, S=15, R=25, - A=MAIL11_MAILER_ARGS +VERSIONID(`$Id: mail11.m4,v 8.19 1999/10/18 04:57:54 gshapiro Exp $') -S15 +SMail11From=15 R$+ $: $>25 $1 preprocess R$w :: $+ $@ $w :: $1 ready to go -S25 +SMail11To=25 R$+ < @ $- .UUCP > $: $2 ! $1 back to old style R$+ < @ $- .DECNET > $: $2 :: $1 convert to DECnet style R$+ < @ $- .LOCAL > $: $2 :: $1 convert to DECnet style R$+ < @ $=w. > $: $2 :: $1 convert to DECnet style R$=w :: $+ $2 strip local names R$+ :: $+ $@ $1 :: $2 already qualified + +Mmail11, P=MAIL11_MAILER_PATH, F=_MODMF_(MAIL11_MAILER_FLAGS, `MAIL11'), S=Mail11From, R=Mail11To, + T=DNS/X-DECnet/X-Unix, + A=MAIL11_MAILER_ARGS diff --git a/contrib/sendmail/cf/mailer/phquery.m4 b/contrib/sendmail/cf/mailer/phquery.m4 index 3e0891a..09032e4 100644 --- a/contrib/sendmail/cf/mailer/phquery.m4 +++ b/contrib/sendmail/cf/mailer/phquery.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. @@ -13,8 +14,11 @@ PUSHDIVERT(-1) # Contributed by Kimmo Suominen <kim@tac.nyc.ny.us>. # +ifdef(`_MAILER_local_', `', + `errprint(`*** MAILER(`local') must appear before MAILER(`phquery')')')dnl + ifdef(`PH_MAILER_PATH',, `define(`PH_MAILER_PATH', /usr/local/etc/phquery)') -ifdef(`PH_MAILER_FLAGS',, `define(`PH_MAILER_FLAGS', `ehmu')') +_DEFIFNOT(`PH_MAILER_FLAGS', `ehmu') ifdef(`PH_MAILER_ARGS',, `define(`PH_MAILER_ARGS', `phquery -- $u')') POPDIVERT @@ -23,7 +27,8 @@ POPDIVERT ### PH Mailer specification ### #################################### -VERSIONID(`@(#)phquery.m4 8.6 (Berkeley) 5/19/1998') +VERSIONID(`$Id: phquery.m4,v 8.15 1999/10/18 04:57:54 gshapiro Exp $') -Mph, P=PH_MAILER_PATH, F=CONCAT(`nrDFM', PH_MAILER_FLAGS), S=10, R=20/40, +Mph, P=PH_MAILER_PATH, F=_MODMF_(CONCAT(`nrDFM', PH_MAILER_FLAGS), `PH'), S=EnvFromL, R=EnvToL/HdrToL, + T=DNS/RFC822/X-Unix, A=PH_MAILER_ARGS diff --git a/contrib/sendmail/cf/mailer/pop.m4 b/contrib/sendmail/cf/mailer/pop.m4 index 0acea7d..a7b373d 100644 --- a/contrib/sendmail/cf/mailer/pop.m4 +++ b/contrib/sendmail/cf/mailer/pop.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. @@ -11,8 +12,11 @@ PUSHDIVERT(-1) # # +ifdef(`_MAILER_local_', `', + `errprint(`*** MAILER(`local') must appear before MAILER(`pop')')')dnl + ifdef(`POP_MAILER_PATH',, `define(`POP_MAILER_PATH', /usr/lib/mh/spop)') -ifdef(`POP_MAILER_FLAGS',, `define(`POP_MAILER_FLAGS', `Penu')') +_DEFIFNOT(`POP_MAILER_FLAGS', `Penu') ifdef(`POP_MAILER_ARGS',, `define(`POP_MAILER_ARGS', `pop $u')') POPDIVERT @@ -21,9 +25,10 @@ POPDIVERT ### POP Mailer specification ### #################################### -VERSIONID(`@(#)pop.m4 8.11 (Berkeley) 5/19/1998') +VERSIONID(`$Id: pop.m4,v 8.20 1999/10/18 04:57:54 gshapiro Exp $') -Mpop, P=POP_MAILER_PATH, F=CONCAT(`lsDFMq', POP_MAILER_FLAGS), S=10, R=20/40, T=DNS/RFC822/X-Unix, +Mpop, P=POP_MAILER_PATH, F=_MODMF_(CONCAT(`lsDFMq', POP_MAILER_FLAGS), `POP'), S=EnvFromL, R=EnvToL/HdrToL, + T=DNS/RFC822/X-Unix, A=POP_MAILER_ARGS LOCAL_CONFIG diff --git a/contrib/sendmail/cf/mailer/procmail.m4 b/contrib/sendmail/cf/mailer/procmail.m4 index 38b6d20..8589f3a 100644 --- a/contrib/sendmail/cf/mailer/procmail.m4 +++ b/contrib/sendmail/cf/mailer/procmail.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. @@ -11,12 +12,14 @@ PUSHDIVERT(-1) # # +ifdef(`_MAILER_smtp_', `', + `errprint(`*** MAILER(`smtp') must appear before MAILER(`procmail')')')dnl + ifdef(`PROCMAIL_MAILER_PATH',, `ifdef(`PROCMAIL_PATH', `define(`PROCMAIL_MAILER_PATH', PROCMAIL_PATH)', `define(`PROCMAIL_MAILER_PATH', /usr/local/bin/procmail)')') -ifdef(`PROCMAIL_MAILER_FLAGS',, - `define(`PROCMAIL_MAILER_FLAGS', `SPhnu9')') +_DEFIFNOT(`PROCMAIL_MAILER_FLAGS', `SPhnu9') ifdef(`PROCMAIL_MAILER_ARGS',, `define(`PROCMAIL_MAILER_ARGS', `procmail -Y -m $h $f $u')') @@ -26,7 +29,8 @@ POPDIVERT ### PROCMAIL Mailer specification ### ##################*****################## -VERSIONID(`@(#)procmail.m4 8.11 (Berkeley) 5/19/1998') +VERSIONID(`$Id: procmail.m4,v 8.20 1999/10/18 04:57:54 gshapiro Exp $') -Mprocmail, P=PROCMAIL_MAILER_PATH, F=CONCAT(`DFM', PROCMAIL_MAILER_FLAGS), S=11/31, R=21/31, T=DNS/RFC822/X-Unix, - ifdef(`PROCMAIL_MAILER_MAX', `M=PROCMAIL_MAILER_MAX, ')A=PROCMAIL_MAILER_ARGS +Mprocmail, P=PROCMAIL_MAILER_PATH, F=_MODMF_(CONCAT(`DFM', PROCMAIL_MAILER_FLAGS), `PROCMAIL'), S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP/HdrFromSMTP, + ifdef(`PROCMAIL_MAILER_MAX', `M=PROCMAIL_MAILER_MAX, ')T=DNS/RFC822/X-Unix, + A=PROCMAIL_MAILER_ARGS diff --git a/contrib/sendmail/cf/mailer/qpage.m4 b/contrib/sendmail/cf/mailer/qpage.m4 new file mode 100644 index 0000000..31521d5 --- /dev/null +++ b/contrib/sendmail/cf/mailer/qpage.m4 @@ -0,0 +1,30 @@ +PUSHDIVERT(-1) +# +# Copyright (C) 1997, Philip A. Prindeville and Enteka Enterprise Technology +# Services +# +# Copyright (c) 1999 Sendmail, Inc. and its suppliers. +# 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. +# +# Tested with QuickPage version 3.2 +# +ifdef(`QPAGE_MAILER_PATH', `', `define(`QPAGE_MAILER_PATH', `/usr/local/bin/qpage')') +_DEFIFNOT(`QPAGE_MAILER_FLAGS', `mDFMs') +ifdef(`QPAGE_MAILER_ARGS', `', `define(`QPAGE_MAILER_ARGS', `qpage -l0 -m -P$u')') +ifdef(`QPAGE_MAILER_MAX', `', `define(`QPAGE_MAILER_MAX', `4096')') + +POPDIVERT + +###################################### +### QPAGE Mailer specification ### +###################################### + +VERSIONID(`$Id: qpage.m4,v 8.9 1999/11/16 03:33:04 gshapiro Exp $') + +Mqpage, P=QPAGE_MAILER_PATH, F=_MODMF_(QPAGE_MAILER_FLAGS, `QPAGE'), + M=QPAGE_MAILER_MAX, T=DNS/RFC822/X-Unix, + A=QPAGE_MAILER_ARGS diff --git a/contrib/sendmail/cf/mailer/smtp.m4 b/contrib/sendmail/cf/mailer/smtp.m4 index 7545597..dd601ec 100644 --- a/contrib/sendmail/cf/mailer/smtp.m4 +++ b/contrib/sendmail/cf/mailer/smtp.m4 @@ -1,6 +1,7 @@ PUSHDIVERT(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998-2000 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,70 +11,32 @@ PUSHDIVERT(-1) # the sendmail distribution. # # -ifdef(`SMTP_MAILER_FLAGS',, `define(`SMTP_MAILER_FLAGS', `')') -ifdef(`SMTP_MAILER_ARGS',, `define(`SMTP_MAILER_ARGS', `IPC $h')') -ifdef(`ESMTP_MAILER_ARGS',, `define(`ESMTP_MAILER_ARGS', `IPC $h')') -ifdef(`SMTP8_MAILER_ARGS',, `define(`SMTP8_MAILER_ARGS', `IPC $h')') -ifdef(`RELAY_MAILER_ARGS',, `define(`RELAY_MAILER_ARGS', `IPC $h')') -ifdef(`_MAILER_uucp_', - `errprint(`*** MAILER(smtp) must appear before MAILER(uucp)')')dnl +_DEFIFNOT(`_DEF_SMTP_MAILER_FLAGS', `mDFMuX') +_DEFIFNOT(`SMTP_MAILER_FLAGS',`') +_DEFIFNOT(`RELAY_MAILER_FLAGS', `SMTP_MAILER_FLAGS') +ifdef(`SMTP_MAILER_ARGS',, `define(`SMTP_MAILER_ARGS', `TCP $h')') +ifdef(`ESMTP_MAILER_ARGS',, `define(`ESMTP_MAILER_ARGS', `TCP $h')') +ifdef(`SMTP8_MAILER_ARGS',, `define(`SMTP8_MAILER_ARGS', `TCP $h')') +ifdef(`DSMTP_MAILER_ARGS',, `define(`DSMTP_MAILER_ARGS', `TCP $h')') +ifdef(`RELAY_MAILER_ARGS',, `define(`RELAY_MAILER_ARGS', `TCP $h')') POPDIVERT ##################################### ### SMTP Mailer specification ### ##################################### -VERSIONID(`@(#)smtp.m4 8.38 (Berkeley) 5/19/1998') +VERSIONID(`$Id: smtp.m4,v 8.56.2.1.2.2 2000/07/18 15:31:24 gshapiro Exp $') -Msmtp, P=[IPC], F=CONCAT(mDFMuX, SMTP_MAILER_FLAGS), S=11/31, R=ifdef(`_ALL_MASQUERADE_', `21/31', `21'), E=\r\n, L=990, - _OPTINS(`SMTP_MAILER_MAX', `M=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP, - A=SMTP_MAILER_ARGS -Mesmtp, P=[IPC], F=CONCAT(mDFMuXa, SMTP_MAILER_FLAGS), S=11/31, R=ifdef(`_ALL_MASQUERADE_', `21/31', `21'), E=\r\n, L=990, - _OPTINS(`SMTP_MAILER_MAX', `M=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP, - A=ESMTP_MAILER_ARGS -Msmtp8, P=[IPC], F=CONCAT(mDFMuX8, SMTP_MAILER_FLAGS), S=11/31, R=ifdef(`_ALL_MASQUERADE_', `21/31', `21'), E=\r\n, L=990, - _OPTINS(`SMTP_MAILER_MAX', `M=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP, - A=SMTP8_MAILER_ARGS -Mrelay, P=[IPC], F=CONCAT(mDFMuXa8, SMTP_MAILER_FLAGS), S=11/31, R=ifdef(`_ALL_MASQUERADE_', `61/71', `61'), E=\r\n, L=2040, - _OPTINS(`RELAY_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP, - A=RELAY_MAILER_ARGS - -# -# envelope sender rewriting # -S11 -R$+ $: $>51 $1 sender/recipient common -R$* :; <@> $@ list:; special case -R$* $: $>61 $1 qualify unqual'ed names -R$+ $: $>94 $1 do masquerading - - -# -# envelope recipient rewriting -- -# also header recipient if not masquerading recipients -# -S21 -R$+ $: $>51 $1 sender/recipient common -R$+ $: $>61 $1 qualify unqual'ed names - - -# -# header sender and masquerading header recipient rewriting +# common sender and masquerading recipient rewriting # -S31 -R$+ $: $>51 $1 sender/recipient common -R:; <@> $@ list:; special case - -# do special header rewriting -R$* <@> $* $@ $1 <@> $2 pass null host through -R< @ $* > $* $@ < @ $1 > $2 pass route-addr through -R$* $: $>61 $1 qualify unqual'ed names -R$+ $: $>93 $1 do masquerading - +SMasqSMTP=61 +R$* < @ $* > $* $@ $1 < @ $2 > $3 already fully qualified +R$+ $@ $1 < @ *LOCAL* > add local qualification # # convert pseudo-domain addresses to real domain addresses # -S51 +SPseudoToReal=51 # pass <route-addr>s through R< @ $+ > $* $@ < @ $1 > $2 resolve <route-addr> @@ -98,18 +61,57 @@ R$+ < @ > $: $1 < @ *LOCAL* > if no UUCP_RELAY') # -# common sender and masquerading recipient rewriting +# envelope sender rewriting # -S61 +SEnvFromSMTP=11 +R$+ $: $>PseudoToReal $1 sender/recipient common +R$* :; <@> $@ list:; special case +R$* $: $>MasqSMTP $1 qualify unqual'ed names +R$+ $: $>MasqEnv $1 do masquerading -R$* < @ $* > $* $@ $1 < @ $2 > $3 already fully qualified -R$+ $@ $1 < @ *LOCAL* > add local qualification + +# +# envelope recipient rewriting -- +# also header recipient if not masquerading recipients +# +SEnvToSMTP=21 +R$+ $: $>PseudoToReal $1 sender/recipient common +R$+ $: $>MasqSMTP $1 qualify unqual'ed names +R$* < @ *LOCAL* > $* $: $1 < @ $j . > $2 + +# +# header sender and masquerading header recipient rewriting +# +SHdrFromSMTP=31 +R$+ $: $>PseudoToReal $1 sender/recipient common +R:; <@> $@ list:; special case + +# do special header rewriting +R$* <@> $* $@ $1 <@> $2 pass null host through +R< @ $* > $* $@ < @ $1 > $2 pass route-addr through +R$* $: $>MasqSMTP $1 qualify unqual'ed names +R$+ $: $>MasqHdr $1 do masquerading # # relay mailer header masquerading recipient rewriting # -S71 +SMasqRelay=71 +R$+ $: $>MasqSMTP $1 +R$+ $: $>MasqHdr $1 -R$+ $: $>61 $1 -R$+ $: $>93 $1 +Msmtp, P=[IPC], F=_MODMF_(CONCAT(_DEF_SMTP_MAILER_FLAGS, SMTP_MAILER_FLAGS), `SMTP'), S=EnvFromSMTP/HdrFromSMTP, R=ifdef(`_ALL_MASQUERADE_', `EnvToSMTP/HdrFromSMTP', `EnvToSMTP'), E=\r\n, L=990, + _OPTINS(`SMTP_MAILER_MAX', `M=', `, ')_OPTINS(`SMTP_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`SMTP_MAILER_MAXRCPTS', `r=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP, + A=SMTP_MAILER_ARGS +Mesmtp, P=[IPC], F=CONCAT(_DEF_SMTP_MAILER_FLAGS, `a', SMTP_MAILER_FLAGS), S=EnvFromSMTP/HdrFromSMTP, R=ifdef(`_ALL_MASQUERADE_', `EnvToSMTP/HdrFromSMTP', `EnvToSMTP'), E=\r\n, L=990, + _OPTINS(`SMTP_MAILER_MAX', `M=', `, ')_OPTINS(`SMTP_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`SMTP_MAILER_MAXRCPTS', `r=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP, + A=ESMTP_MAILER_ARGS +Msmtp8, P=[IPC], F=CONCAT(_DEF_SMTP_MAILER_FLAGS, `8', SMTP_MAILER_FLAGS), S=EnvFromSMTP/HdrFromSMTP, R=ifdef(`_ALL_MASQUERADE_', `EnvToSMTP/HdrFromSMTP', `EnvToSMTP'), E=\r\n, L=990, + _OPTINS(`SMTP_MAILER_MAX', `M=', `, ')_OPTINS(`SMTP_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`SMTP_MAILER_MAXRCPTS', `r=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP, + A=SMTP8_MAILER_ARGS +Mdsmtp, P=[IPC], F=CONCAT(_DEF_SMTP_MAILER_FLAGS, `a%', SMTP_MAILER_FLAGS), S=EnvFromSMTP/HdrFromSMTP, R=ifdef(`_ALL_MASQUERADE_', `EnvToSMTP/HdrFromSMTP', `EnvToSMTP'), E=\r\n, L=990, + _OPTINS(`SMTP_MAILER_MAX', `M=', `, ')_OPTINS(`SMTP_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`SMTP_MAILER_MAXRCPTS', `r=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP, + A=DSMTP_MAILER_ARGS +Mrelay, P=[IPC], F=CONCAT(_DEF_SMTP_MAILER_FLAGS, `a8', RELAY_MAILER_FLAGS), S=EnvFromSMTP/HdrFromSMTP, R=ifdef(`_ALL_MASQUERADE_', `MasqSMTP/MasqRelay', `MasqSMTP'), E=\r\n, L=2040, + _OPTINS(`RELAY_MAILER_CHARSET', `C=', `, ')_OPTINS(`RELAY_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`SMTP_MAILER_MAXRCPTS', `r=', `, ')T=DNS/RFC822/SMTP, + A=RELAY_MAILER_ARGS diff --git a/contrib/sendmail/cf/mailer/usenet.m4 b/contrib/sendmail/cf/mailer/usenet.m4 index 1535751..770eb30 100644 --- a/contrib/sendmail/cf/mailer/usenet.m4 +++ b/contrib/sendmail/cf/mailer/usenet.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. @@ -11,16 +12,19 @@ PUSHDIVERT(-1) # # +ifdef(`_MAILER_local_', `', + `errprint(`*** MAILER(`local') must appear before MAILER(`usenet')')')dnl + ifdef(`USENET_MAILER_PATH',, `define(`USENET_MAILER_PATH', /usr/lib/news/inews)') -ifdef(`USENET_MAILER_FLAGS',, `define(`USENET_MAILER_FLAGS', `rlsDFMmn')') +_DEFIFNOT(`USENET_MAILER_FLAGS', `rsDFMmn') ifdef(`USENET_MAILER_ARGS',, `define(`USENET_MAILER_ARGS', `inews -m -h -n')') POPDIVERT #################################### ### USENET Mailer specification ### #################################### -VERSIONID(`@(#)usenet.m4 8.10 (Berkeley) 5/19/1998') +VERSIONID(`$Id: usenet.m4,v 8.19 1999/11/16 03:33:04 gshapiro Exp $') -Musenet, P=USENET_MAILER_PATH, F=USENET_MAILER_FLAGS, S=10, R=20, +Musenet, P=USENET_MAILER_PATH, F=_MODMF_(USENET_MAILER_FLAGS, `USENET'), S=EnvFromL, R=EnvToL, _OPTINS(`USENET_MAILER_MAX', `M=', `, ')T=X-Usenet/X-Usenet/X-Unix, A=USENET_MAILER_ARGS $u diff --git a/contrib/sendmail/cf/mailer/uucp.m4 b/contrib/sendmail/cf/mailer/uucp.m4 index badd307..dd915c3 100644 --- a/contrib/sendmail/cf/mailer/uucp.m4 +++ b/contrib/sendmail/cf/mailer/uucp.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,12 @@ PUSHDIVERT(-1) # the sendmail distribution. # # +ifdef(`_MAILER_smtp_', `', + `errprint(`*** MAILER(`smtp') must appear before MAILER(`uucp')')')dnl ifdef(`UUCP_MAILER_PATH',, `define(`UUCP_MAILER_PATH', /usr/bin/uux)') ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -a$g -gC $h!rmail ($u)')') -ifdef(`UUCP_MAILER_FLAGS',, `define(`UUCP_MAILER_FLAGS', `')') +_DEFIFNOT(`UUCP_MAILER_FLAGS', `') ifdef(`UUCP_MAILER_MAX',, `define(`UUCP_MAILER_MAX', `ifdef(`UUCP_MAX_SIZE', `UUCP_MAX_SIZE', 100000)')') @@ -22,45 +25,12 @@ POPDIVERT ### UUCP Mailer specification ### ##################################### -VERSIONID(`@(#)uucp.m4 8.30 (Berkeley) 5/19/1998') - -# -# There are innumerable variations on the UUCP mailer. It really -# is rather absurd. -# - -# old UUCP mailer (two names) -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(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(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(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(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(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') - +VERSIONID(`$Id: uucp.m4,v 8.38 1999/10/18 04:57:55 gshapiro Exp $') # # envelope and header sender rewriting # -S12 +SFromU=12 # handle error address as a special case R<@> $n errors to mailer-daemon @@ -82,7 +52,7 @@ R! $+ $: $k ! $1 in case $U undefined # # envelope recipient rewriting # -S22 +SEnvToU=22 # list:; should disappear R:; <@> $@ @@ -97,7 +67,7 @@ R$* < @ $+ > $2 ! $1 convert to UUCP format # # header recipient rewriting # -S42 +SHdrToU=42 # list:; syntax should disappear R:; <@> $@ @@ -118,24 +88,24 @@ ifdef(`_MAILER_smtp_', `# # envelope sender rewriting for uucp-dom mailer # -S52 +SEnvFromUD=52 # handle error address as a special case R<@> $n errors to mailer-daemon # pass everything to standard SMTP mailer rewriting -R$* $@ $>11 $1 +R$* $@ $>EnvFromSMTP $1 # # envelope sender rewriting for uucp-uudom mailer # -S72 +SEnvFromUUD=72 # handle error address as a special case R<@> $n errors to mailer-daemon # do standard SMTP mailer rewriting -R$* $: $>11 $1 +R$* $: $>EnvFromSMTP $1 R$* < @ $* . > $* $1 < @ $2 > $3 strip trailing dots R<@ $- . UUCP > : $+ $@ $1 ! $2 convert to UUCP format @@ -150,3 +120,37 @@ R$* < @ $=Z . UUCP. > $* $#uucp-uudom $@ $2 $: $1 < @ $2 .UUCP. > $3 R$* < @ $=Y . UUCP. > $* $#uucp-new $@ $2 $: $1 < @ $2 .UUCP. > $3 R$* < @ $=U . UUCP. > $* $#uucp-old $@ $2 $: $1 < @ $2 .UUCP. > $3 POPDIVERT + +# +# There are innumerable variations on the UUCP mailer. It really +# is rather absurd. +# + +# old UUCP mailer (two names) +Muucp, P=UUCP_MAILER_PATH, F=_MODMF_(CONCAT(`DFMhuUd', UUCP_MAILER_FLAGS), `UUCP'), S=FromU, R=EnvToU/HdrToU, + 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=_MODMF_(CONCAT(`DFMhuUd', UUCP_MAILER_FLAGS), `UUCP'), S=FromU, R=EnvToU/HdrToU, + 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=_MODMF_(CONCAT(`mDFMhuUd', UUCP_MAILER_FLAGS), `UUCP'), S=FromU, R=EnvToU/HdrToU, + 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=_MODMF_(CONCAT(`mDFMhuUd', UUCP_MAILER_FLAGS), `UUCP'), S=FromU, R=EnvToU/HdrToU, + 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=_MODMF_(CONCAT(`mDFMhud', UUCP_MAILER_FLAGS), `UUCP'), S=EnvFromUD/HdrFromSMTP, R=ifdef(`_ALL_MASQUERADE_', `EnvToSMTP/HdrFromSMTP', `EnvToSMTP'), + 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=_MODMF_(CONCAT(`mDFMhud', UUCP_MAILER_FLAGS), `UUCP'), S=EnvFromUUD/HdrFromSMTP, R=ifdef(`_ALL_MASQUERADE_', `EnvToSMTP/HdrFromSMTP', `EnvToSMTP'), + M=UUCP_MAILER_MAX, _OPTINS(`UUCP_MAILER_CHARSET', `C=', `, ')T=X-UUCP/X-UUCP/X-Unix, + A=UUCP_MAILER_ARGS') + + |
