diff options
Diffstat (limited to 'usr.sbin/sendmail/cf/feature/nullclient.m4')
| -rw-r--r-- | usr.sbin/sendmail/cf/feature/nullclient.m4 | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/usr.sbin/sendmail/cf/feature/nullclient.m4 b/usr.sbin/sendmail/cf/feature/nullclient.m4 index 930f265..7543070 100644 --- a/usr.sbin/sendmail/cf/feature/nullclient.m4 +++ b/usr.sbin/sendmail/cf/feature/nullclient.m4 @@ -32,9 +32,7 @@ PUSHDIVERT(-1) # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -ifdef(`SMTP_MAILER_FLAGS',, - `define(`SMTP_MAILER_FLAGS', - `ifdef(`_OLD_SENDMAIL_', `L', `')')') +ifdef(`SMTP_MAILER_FLAGS',, `define(`SMTP_MAILER_FLAGS', `')') define(_NULL_CLIENT_ONLY_, `1') ifelse(_ARG_, `', `errprint(`Feature "nullclient" requires argument')', `define(`MAIL_HUB', _ARG_)') @@ -47,8 +45,17 @@ POPDIVERT # sendmail. # -VERSIONID(`@(#)nullclient.m4 8.2 (Berkeley) 8/21/93') +VERSIONID(`@(#)nullclient.m4 8.6 (Berkeley) 6/29/95') +PUSHDIVERT(6) +# hub host (to which all mail is sent) +DH`'ifdef(`MAIL_HUB', MAIL_HUB, + `errprint(`MAIL_HUB not defined for nullclient feature')') +ifdef(`MASQUERADE_NAME',, `define(`MASQUERADE_NAME', MAIL_HUB)')dnl + +# route-addr separators +C: : , +POPDIVERT PUSHDIVERT(7) ############################################ ### Null Client Mailer specification ### @@ -56,6 +63,9 @@ PUSHDIVERT(7) ifdef(`confRELAY_MAILER',, `define(`confRELAY_MAILER', `nullclient')')dnl +ifdef(`confFROM_HEADER',, + `define(`confFROM_HEADER', <$g>)')dnl -Mnullclient, P=[IPC], F=CONCAT(mDFMuXa, SMTP_MAILER_FLAGS), A=IPC $h +Mnullclient, P=[IPC], F=CONCAT(mDFMuXa, SMTP_MAILER_FLAGS),ifdef(`SMTP_MAILER_MAX', ` M=SMTP_MAILER_MAX,') + A=IPC $h POPDIVERT |
