diff options
| -rw-r--r-- | gnu/usr.sbin/sendmail/cf/cf/openbsd-localhost.mc | 39 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/cf/cf/openbsd-proto.mc | 9 |
2 files changed, 10 insertions, 38 deletions
diff --git a/gnu/usr.sbin/sendmail/cf/cf/openbsd-localhost.mc b/gnu/usr.sbin/sendmail/cf/cf/openbsd-localhost.mc index 986152e0d09..de62d8ba174 100644 --- a/gnu/usr.sbin/sendmail/cf/cf/openbsd-localhost.mc +++ b/gnu/usr.sbin/sendmail/cf/cf/openbsd-localhost.mc @@ -1,37 +1,2 @@ -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 configuration only runs sendmail on the localhost interface. -# This allows mail on the local host to work without accepting -# connections from the net at large. -# - -divert(0)dnl -VERSIONID(`@(#)openbsd-localhost.mc $Revision: 1.4 $') -OSTYPE(openbsd)dnl -FEATURE(nouucp, `reject')dnl -FEATURE(`accept_unresolvable_domains')dnl -FEATURE(`no_default_msa')dnl -MAILER(local)dnl -MAILER(smtp)dnl -DAEMON_OPTIONS(`Family=inet, address=127.0.0.1, Name=MTA')dnl -DAEMON_OPTIONS(`Family=inet6, address=::1, Name=MTA6, M=O')dnl -DAEMON_OPTIONS(`Family=inet, address=127.0.0.1, Port=587, Name=MSA, M=E')dnl -DAEMON_OPTIONS(`Family=inet6, address=::1, Port=587, Name=MSA6, M=O, M=E')dnl -CLIENT_OPTIONS(`Family=inet6, Address=::')dnl -CLIENT_OPTIONS(`Family=inet, Address=0.0.0.0')dnl -dnl -dnl Some broken nameservers will return SERVFAIL (a temporary failure) -dnl on T_AAAA (IPv6) lookups. -define(`confBIND_OPTS', `WorkAroundBrokenAAAA')dnl +define(`LOCALHOST_ONLY')dnl +include(_CF_DIR_`cf/openbsd-proto.mc')dnl diff --git a/gnu/usr.sbin/sendmail/cf/cf/openbsd-proto.mc b/gnu/usr.sbin/sendmail/cf/cf/openbsd-proto.mc index e5e9644947b..dc816374592 100644 --- a/gnu/usr.sbin/sendmail/cf/cf/openbsd-proto.mc +++ b/gnu/usr.sbin/sendmail/cf/cf/openbsd-proto.mc @@ -6,7 +6,7 @@ divert(-1) # Note that lines beginning with "dnl" below are comments. divert(0)dnl -VERSIONID(`@(#)openbsd-proto.mc $Revision: 1.11 $')dnl +VERSIONID(`@(#)openbsd-proto.mc $Revision: 1.12 $')dnl OSTYPE(openbsd)dnl dnl dnl If you have a non-static IP address you may wish to forward outgoing mail @@ -86,10 +86,17 @@ dnl Accept incoming connections on any IPv4 or IPv6 interface for ports dnl 25 (SMTP) and 587 (MSA). dnl FEATURE(`no_default_msa')dnl +ifdef(`LOCALHOST_ONLY', ` +DAEMON_OPTIONS(`Family=inet, address=127.0.0.1, Name=MTA')dnl +DAEMON_OPTIONS(`Family=inet6, address=::1, Name=MTA6, M=O')dnl +DAEMON_OPTIONS(`Family=inet, address=127.0.0.1, Port=587, Name=MSA, M=E')dnl +DAEMON_OPTIONS(`Family=inet6, address=::1, Port=587, Name=MSA6, M=O, M=E')dnl +',` DAEMON_OPTIONS(`Family=inet, Address=0.0.0.0, Name=MTA')dnl DAEMON_OPTIONS(`Family=inet6, Address=::, Name=MTA6, M=O')dnl DAEMON_OPTIONS(`Family=inet, Address=0.0.0.0, Port=587, Name=MSA, M=E')dnl DAEMON_OPTIONS(`Family=inet6, Address=::, Port=587, Name=MSA6, M=O, M=E')dnl +')dnl dnl dnl Use either IPv4 or IPv6 for outgoing connections. dnl |