diff options
| author |   millert <millert@openbsd.org> | 2008-10-03 16:29:05 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2008-10-03 16:29:05 +0000 |
| commit | b0df5ea039fa7766f5c921792d5b890cfc1ad0f9 (patch) | |
| tree | 7b470b2fa901299827161c04149e2d16880ba091 | |
| parent | Unify code between the various flavors of imsg buffer.c. (diff) | |
| download | wireguard-openbsd-b0df5ea039fa7766f5c921792d5b890cfc1ad0f9.tar.xz wireguard-openbsd-b0df5ea039fa7766f5c921792d5b890cfc1ad0f9.zip | |
Add openbsd-submit.mc, a custom version submit.mc and revert the
existing submit.mc to the stock version. Closes PR 4951.
OK sthen@ martynas@
| -rw-r--r-- | gnu/usr.sbin/sendmail/cf/cf/Makefile | 8 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/cf/cf/openbsd-submit.mc | 30 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/cf/cf/submit.mc | 4 |
3 files changed, 36 insertions, 6 deletions
diff --git a/gnu/usr.sbin/sendmail/cf/cf/Makefile b/gnu/usr.sbin/sendmail/cf/cf/Makefile index 86a4249097e..f3463570877 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.23 2008/06/09 15:40:21 pyr Exp $ +# $OpenBSD: Makefile,v 1.24 2008/10/03 16:29:05 millert Exp $ # # Makefile for configuration files. # @@ -29,7 +29,7 @@ RM= rm -f $(SED) -e 's/^/# /' ${.CURDIR}/$*.mc >>$@ $(CHMOD) $(ROMODE) $@ -ALL= submit.cf clientproto.cf tcpproto.cf openbsd-localhost.cf \ +ALL= openbsd-submit.cf clientproto.cf tcpproto.cf openbsd-localhost.cf \ openbsd-proto.cf courtesan.cf courtesan-nonet.cf openbsd-lists.cf \ openbsd-bulk.cf lucifier.cf corpse.cf knecht.cf @@ -57,12 +57,12 @@ install: fi; \ fi -distribution: openbsd-proto.cf openbsd-localhost.cf submit.cf +distribution: openbsd-proto.cf openbsd-localhost.cf openbsd-submit.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-localhost.cf \ ${DESTDIR}/etc/mail/localhost.cf - ${INSTALL} ${INSTALL_COPY} -o root -g wheel -m 644 submit.cf \ + ${INSTALL} ${INSTALL_COPY} -o root -g wheel -m 644 openbsd-submit.cf \ ${DESTDIR}/etc/mail/submit.cf # this is overkill, but.... diff --git a/gnu/usr.sbin/sendmail/cf/cf/openbsd-submit.mc b/gnu/usr.sbin/sendmail/cf/cf/openbsd-submit.mc new file mode 100644 index 00000000000..acf673d0311 --- /dev/null +++ b/gnu/usr.sbin/sendmail/cf/cf/openbsd-submit.mc @@ -0,0 +1,30 @@ +divert(-1) +# +# Copyright (c) 2001-2003 Sendmail, Inc. and its suppliers. +# 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 set-group-ID sm-msp sendmail that +# acts as a initial mail submission program. +# + +divert(0)dnl +VERSIONID(`$OpenBSD: openbsd-submit.mc,v 1.1 2008/10/03 16:29:05 millert Exp $') +define(`confCF_VERSION', `Submit')dnl +OSTYPE(openbsd)dnl +define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet +define(`confTIME_ZONE', `USE_TZ')dnl +define(`confBIND_OPTS', `WorkAroundBrokenAAAA')dnl +define(`confDONT_INIT_GROUPS', `True')dnl +define(`confCT_FILE', `-o MAIL_SETTINGS_DIR`'trusted-users')dnl +FEATURE(`use_ct_file')dnl +FEATURE(`accept_unresolvable_domains')dnl +dnl +dnl If you use IPv6 only, change [127.0.0.1] to [IPv6:::1] +FEATURE(`msp', `[127.0.0.1]')dnl diff --git a/gnu/usr.sbin/sendmail/cf/cf/submit.mc b/gnu/usr.sbin/sendmail/cf/cf/submit.mc index ea2bdee7f0d..5cef569f0de 100644 --- a/gnu/usr.sbin/sendmail/cf/cf/submit.mc +++ b/gnu/usr.sbin/sendmail/cf/cf/submit.mc @@ -20,7 +20,7 @@ define(`confCF_VERSION', `Submit')dnl define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet define(`confTIME_ZONE', `USE_TZ')dnl -define(`confBIND_OPTS', `WorkAroundBrokenAAAA')dnl define(`confDONT_INIT_GROUPS', `True')dnl -FEATURE(`accept_unresolvable_domains')dnl +dnl +dnl If you use IPv6 only, change [127.0.0.1] to [IPv6:::1] FEATURE(`msp', `[127.0.0.1]')dnl |