diff options
author | Paul Traina <pst@FreeBSD.org> | 1996-11-13 08:06:26 +0000 |
---|---|---|
committer | Paul Traina <pst@FreeBSD.org> | 1996-11-13 08:06:26 +0000 |
commit | e4b708058610f7fbdc2394589ca024cc1ae691de (patch) | |
tree | 36deb64da2c59ebb2e049c203e73516d58ad24f2 /usr.sbin | |
parent | 4c81f2a3fdd0073dc8bca4c683a84d497c24fb28 (diff) | |
download | src-e4b708058610f7fbdc2394589ca024cc1ae691de.tar.gz src-e4b708058610f7fbdc2394589ca024cc1ae691de.zip |
Back out freebsd local change which always forced SMTP to assume an 8-bit
clear channel. This change was originally put in for freefall, and is
completely irrelevant given that freefaill defines the generic SMTP
service to use the smtp8 mailer (which is standard mechanism.)
[The original patch violated RFC-821.]
Apply to: 2.2 (please)
Notes
Notes:
svn path=/head/; revision=19703
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/sendmail/cf/mailer/smtp.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/sendmail/cf/mailer/smtp.m4 b/usr.sbin/sendmail/cf/mailer/smtp.m4 index 44c9f0d34b41..c816c736001b 100644 --- a/usr.sbin/sendmail/cf/mailer/smtp.m4 +++ b/usr.sbin/sendmail/cf/mailer/smtp.m4 @@ -46,10 +46,10 @@ POPDIVERT VERSIONID(`@(#)smtp.m4 8.33 (Berkeley) 7/9/96') -Msmtp, P=[IPC], F=CONCAT(mDFMuX8, SMTP_MAILER_FLAGS), S=11/31, R=ifdef(`_ALL_MASQUERADE_', `21/31', `21'), E=\r\n, L=990, +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(mDFMuXa8, SMTP_MAILER_FLAGS), S=11/31, R=ifdef(`_ALL_MASQUERADE_', `21/31', `21'), E=\r\n, L=990, +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, |