summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorgshapiro <gshapiro@FreeBSD.org>2002-04-21 20:32:28 +0000
committergshapiro <gshapiro@FreeBSD.org>2002-04-21 20:32:28 +0000
commitdc941e21d52b31176fe0eccccebef9f4dec29970 (patch)
tree2e817fee0df41f77d264d5553cddef55f5e60eb5 /etc
parent4c92f1efeac78d6b5032c5ef85d0a4c4e7e81d8c (diff)
downloadFreeBSD-src-dc941e21d52b31176fe0eccccebef9f4dec29970.zip
FreeBSD-src-dc941e21d52b31176fe0eccccebef9f4dec29970.tar.gz
Non-sendmail users use the FreeBSD sendmail startup functionality to start
alternative MTAs. Therefore, always install rc.sendmail, regardless of NO_SENDMAIL make.conf setting. Users can still set mta_start_script to a different script. This commit is after a repo-copy of src/etc/sendmail/rc.sendmail to src/etc/rc.sendmail. Noticed by: Calvin NG <calvinng@brel.com> MFC after: 3 days
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile2
-rw-r--r--etc/sendmail/Makefile2
-rw-r--r--etc/sendmail/rc.sendmail194
3 files changed, 1 insertions, 197 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 3a6e8ad..0a341bf 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -13,7 +13,7 @@ BIN1= amd.map apmd.conf auth.conf \
motd modems netconfig networks newsyslog.conf \
phones printcap profile protocols \
rc rc.atm rc.devfs rc.diskless1 rc.diskless2 rc.firewall rc.firewall6 \
- rc.network rc.network6 rc.pccard rc.serial rc.shutdown \
+ rc.network rc.network6 rc.pccard rc.sendmail rc.serial rc.shutdown \
rc.syscons rc.sysctl remote rpc services shells sysctl.conf \
syslog.conf usbd.conf \
etc.${MACHINE_ARCH}/disktab \
diff --git a/etc/sendmail/Makefile b/etc/sendmail/Makefile
index 6cc5256..5162498 100644
--- a/etc/sendmail/Makefile
+++ b/etc/sendmail/Makefile
@@ -103,8 +103,6 @@ distribution: freebsd.cf freebsd.mc ${INSTALL_CF} ${INSTALL_SUBMIT_CF}
@echo ">>> ERROR: Both SENDMAIL_CF and SENDMAIL_MC can not be set"
@false
.endif
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/rc.sendmail \
- ${DESTDIR}/etc
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/freebsd.mc \
${DESTDIR}/etc/mail/freebsd.mc
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \
diff --git a/etc/sendmail/rc.sendmail b/etc/sendmail/rc.sendmail
deleted file mode 100644
index 4f8a2ca..0000000
--- a/etc/sendmail/rc.sendmail
+++ /dev/null
@@ -1,194 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2002 Gregory Neil Shapiro. All Rights Reserved.
-# Copyright (c) 2000, 2002 The FreeBSD Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-#
-
-# This script is used by /etc/rc at boot time to start sendmail. It
-# is meant to be sendmail specific and not a generic script for all
-# MTAs. It is only called by /etc/rc if the rc.conf mta_start_script is
-# set to /etc/rc.sendmail. This provides the opportunity for other MTAs
-# to provide their own startup script.
-
-# The script is also used by /etc/mail/Makefile to enable the
-# start/stop/restart targets.
-
-# The source for the script can be found in src/etc/sendmail/rc.sendmail.
-
-if [ -r /etc/defaults/rc.conf ]; then
- . /etc/defaults/rc.conf
- source_rc_confs
-elif [ -r /etc/rc.conf ]; then
- . /etc/rc.conf
-fi
-
-# The sendmail binary
-sendmail_program=${sendmail_program:-/usr/sbin/sendmail}
-
-# The pid is used to stop and restart the running daemon(s).
-sendmail_pidfile=${sendmail_pidfile:-/var/run/sendmail.pid}
-sendmail_mspq_pidfile=${sendmail_mspq_pidfile:-/var/spool/clientmqueue/sm-client.pid}
-
-start_mta()
-{
- case ${sendmail_enable} in
- [Nn][Oo][Nn][Ee])
- ;;
- [Yy][Ee][Ss])
- echo -n ' sendmail'
- ${sendmail_program} ${sendmail_flags}
- ;;
- *)
- case ${sendmail_submit_enable} in
- [Yy][Ee][Ss])
- echo -n ' sendmail-submit'
- ${sendmail_program} ${sendmail_submit_flags}
- ;;
- *)
- case ${sendmail_outbound_enable} in
- [Yy][Ee][Ss])
- echo -n ' sendmail-outbound'
- ${sendmail_program} ${sendmail_outbound_flags}
- ;;
- esac
- ;;
- esac
- ;;
- esac
-}
-
-stop_mta()
-{
- if [ -r ${sendmail_pidfile} ]; then
- echo -n ' sendmail'
- kill -TERM `head -1 ${sendmail_pidfile}`
- else
- echo "$0: stop-mta: ${sendmail_pidfile} not found"
- fi
-}
-
-restart_mta()
-{
- if [ -r ${sendmail_pidfile} ]; then
- echo -n ' sendmail'
- kill -HUP `head -1 ${sendmail_pidfile}`
- else
- echo "$0: restart-mta: ${sendmail_pidfile} not found"
- fi
-}
-
-start_mspq()
-{
- case ${sendmail_enable} in
- [Nn][Oo][Nn][Ee])
- ;;
- *)
- if [ -r /etc/mail/submit.cf ]; then
- case ${sendmail_msp_queue_enable} in
- [Yy][Ee][Ss])
- echo -n ' sendmail-clientmqueue'
- ${sendmail_program} ${sendmail_msp_queue_flags}
- ;;
- esac
- fi
- ;;
- esac
-}
-
-stop_mspq()
-{
- if [ -r ${sendmail_mspq_pidfile} ]; then
- echo -n ' sendmail-clientmqueue'
- kill -TERM `head -1 ${sendmail_mspq_pidfile}`
- else
- echo "$0: stop-mspq: ${sendmail_mspq_pidfile} not found"
- fi
-}
-
-restart_mspq()
-{
- if [ -r ${sendmail_mspq_pidfile} ]; then
- echo -n ' sendmail-clientmqueue'
- kill -HUP `head -1 ${sendmail_mspq_pidfile}`
- else
- echo "$0: restart-mspq: ${sendmail_mspq_pidfile} not found"
- fi
-}
-
-# If no argument is given, assume we are being called at boot time.
-_action=${1:-start}
-
-case ${_action} in
-start)
- start_mta
- start_mspq
- ;;
-
-stop)
- stop_mta
- stop_mspq
- ;;
-
-restart)
- restart_mta
- restart_mspq
- ;;
-
-start-mta)
- start_mta
- ;;
-
-stop-mta)
- stop_mta
- ;;
-
-restart-mta)
- restart_mta
- ;;
-
-start-mspq)
- start_mspq
- ;;
-
-stop-mspq)
- stop_mspq
- ;;
-
-restart-mspq)
- restart_mspq
- ;;
-
-*)
- echo "Usage: `basename $0` {start|stop|restart}" >&2
- echo " `basename $0` {start-mta|stop-mta|restart-mta}" >&2
- echo " `basename $0` {start-mspq|stop-mspq|restart-mspq}" >&2
- exit 64
- ;;
-
-esac
-exit 0
OpenPOWER on IntegriCloud