summaryrefslogtreecommitdiff
path: root/debian/cf
diff options
context:
space:
mode:
authorRichard A Nelson (Rick) <cowboy@debian.org>2007-12-07 20:15:00 +0000
committerAndreas Beckmann <debian@abeckmann.de>2012-10-01 20:07:34 +0200
commit7d8d824e23d828c84fada5fb3b0180a0a0aa4409 (patch)
treed02fe68c5f16b12a959fe6d6b7b53c4d70d0e3e4 /debian/cf
parentd920c2bbf44af5fa0af8d4112290cb55a0de3c94 (diff)
downloadsendmail-debian/8.14.2-3.tar.gz
Imported Debian patch 8.14.2-3debian/8.14.2-3
Diffstat (limited to 'debian/cf')
-rw-r--r--debian/cf/Makefile.in4
-rw-r--r--debian/cf/debian/sendmail.mc.in4
-rw-r--r--debian/cf/debian/submit.mc.in3
3 files changed, 6 insertions, 5 deletions
diff --git a/debian/cf/Makefile.in b/debian/cf/Makefile.in
index 29e946a..522f761 100644
--- a/debian/cf/Makefile.in
+++ b/debian/cf/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff --git a/debian/cf/debian/sendmail.mc.in b/debian/cf/debian/sendmail.mc.in
index 2c97995..bb99681 100644
--- a/debian/cf/debian/sendmail.mc.in
+++ b/debian/cf/debian/sendmail.mc.in
@@ -55,8 +55,8 @@ dnl #
FEATURE(`no_default_msa')dnl
dnl DAEMON_OPTIONS(`Family=inet6, Name=MTA-v6, Port=smtp, Addr=::1')dnl
DAEMON_OPTIONS(`Family=inet, Name=MTA-v4, Port=smtp, Addr=127.0.0.1')dnl
-dnl DAEMON_OPTIONS(`Family=inet6, Name=MSP-v6, Port=submission, Addr=::1')dnl
-DAEMON_OPTIONS(`Family=inet, Name=MSP-v4, Port=submission, Addr=127.0.0.1')dnl
+dnl DAEMON_OPTIONS(`Family=inet6, Name=MSP-v6, Port=submission, M=Ea, Addr=::1')dnl
+DAEMON_OPTIONS(`Family=inet, Name=MSP-v4, Port=submission, M=Ea, Addr=127.0.0.1')dnl
dnl #
dnl # Be somewhat anal in what we allow
define(`confPRIVACY_FLAGS',dnl
diff --git a/debian/cf/debian/submit.mc.in b/debian/cf/debian/submit.mc.in
index b7c652f..945d080 100644
--- a/debian/cf/debian/submit.mc.in
+++ b/debian/cf/debian/submit.mc.in
@@ -46,8 +46,9 @@ dnl FEATURE(`masquerade_envelope')dnl
dnl #
dnl #---------------------------------------------------------------------
dnl # The real reason we're here: the FEATURE(msp)
+dnl # NOTE WELL: MSA (587) should have M=Ea, so we need to use stock 25
dnl #---------------------------------------------------------------------
-FEATURE(`msp', `[127.0.0.1]', `MSA')dnl
+FEATURE(`msp', `[127.0.0.1]', `25')dnl
dnl #
dnl #---------------------------------------------------------------------
dnl # Some minor cleanup from FEATURE(msp)