make /etc/mail/sendmail.cf to listen to both IPv4 and IPv6 smtp port.

supply /etc/mail/sendmail-IPv4only.cf, since sendmail.cf chokes on
IPv4-only kernel.

3 files changed, 44 insertions, 4 deletions

diff --git a/gnu/usr.sbin/sendmail/cf/cf/Makefile b/gnu/usr.sbin/sendmail/cf/cf/Makefile
index 83004452c51..5622b7b766d 100644
--- a/gnu/usr.sbin/sendmail/cf/cf/Makefile
+++ b/gnu/usr.sbin/sendmail/cf/cf/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2000/04/02 21:12:29 millert Exp $
+#	$OpenBSD: Makefile,v 1.5 2000/06/18 00:14:40 itojun Exp $
 #
 #  Makefile for configuration files.
 #
@@ -27,7 +27,8 @@ RM=	rm -f
 
 ALL=	clientproto.cf openbsd-proto.cf courtesan.cf courtesan-nonet.cf \
 	courtesan-lists.cf  openbsd-lists.cf gandalf.cf saruman.cf alatar.cf \
-	nettan.cf waldorf.cf lucifier.cf elbereth.cf corpse.cf knecht.cf
+	nettan.cf waldorf.cf lucifier.cf elbereth.cf corpse.cf knecht.cf \
+	openbsd-proto-IPv4only.cf 
 
 all: $(ALL)
 
@@ -36,9 +37,11 @@ clean cleandir:
 
 depend install:
 
-distribution: openbsd-proto.cf
+distribution: openbsd-proto.cf openbsd-proto-IPv6.cf
 	${INSTALL} ${INSTALL_COPY} -o root -g wheel -m 644 openbsd-proto.cf \
 	    ${DESTDIR}/etc/mail/sendmail.cf
+	${INSTALL} ${INSTALL_COPY} -o root -g wheel -m 644 \
+	    openbsd-proto-IPv4only.cf ${DESTDIR}/etc/mail/sendmail-IPv4only.cf
 
 # this is overkill, but....
 M4FILES=\
diff --git a/gnu/usr.sbin/sendmail/cf/cf/openbsd-proto-IPv4only.mc b/gnu/usr.sbin/sendmail/cf/cf/openbsd-proto-IPv4only.mc
new file mode 100644
index 00000000000..54403defbcd
--- /dev/null
+++ b/gnu/usr.sbin/sendmail/cf/cf/openbsd-proto-IPv4only.mc
@@ -0,0 +1,35 @@
+divert(-1)
+#
+# Copyright (c) 1998 Sendmail, Inc.  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.
+#
+# 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.
+#
+#
+
+#
+#  This is the prototype file for a configuration that supports nothing
+#  but basic SMTP connections via TCP.
+#
+
+divert(0)dnl
+VERSIONID(`@(#)openbsd-proto.mc $Revision: 1.1 $')
+OSTYPE(openbsd)
+FEATURE(nouucp, `reject')
+MAILER(local)
+MAILER(smtp)
+dnl DAEMON_OPTIONS(`Family=inet, address=0.0.0.0, Name=MTA')dnl
+dnl DAEMON_OPTIONS(`Family=inet6, address=::, Name=MTA6')dnl
+dnl
+dnl Enforce valid Message-Id to help stop spammers
+dnl
+LOCAL_RULESETS
+HMessage-Id: $>CheckMessageId
+
+SCheckMessageId
+R< $+ @ $+ >		$@ OK
+R$*			$#error $: 553 Header Error
diff --git a/gnu/usr.sbin/sendmail/cf/cf/openbsd-proto.mc b/gnu/usr.sbin/sendmail/cf/cf/openbsd-proto.mc
index f2480632a62..18cd0fd969b 100644
--- a/gnu/usr.sbin/sendmail/cf/cf/openbsd-proto.mc
+++ b/gnu/usr.sbin/sendmail/cf/cf/openbsd-proto.mc
@@ -17,11 +17,13 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`@(#)openbsd-proto.mc $Revision: 1.1 $')
+VERSIONID(`@(#)openbsd-proto.mc $Revision: 1.2 $')
 OSTYPE(openbsd)
 FEATURE(nouucp, `reject')
 MAILER(local)
 MAILER(smtp)
+DAEMON_OPTIONS(`Family=inet, address=0.0.0.0, Name=MTA')dnl
+DAEMON_OPTIONS(`Family=inet6, address=::, Name=MTA6')dnl
 dnl
 dnl Enforce valid Message-Id to help stop spammers
 dnl