diff options
| -rw-r--r-- | mail/qmail-run/Makefile | 4 | ||||
| -rw-r--r-- | mail/qmail-run/files/qmail-qread-client.sh | 9 | ||||
| -rw-r--r-- | mail/qmail-run/files/qmail.sh | 6 |
3 files changed, 13 insertions, 6 deletions
diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile index 97b1bfa24eb..a6958ad31a2 100644 --- a/mail/qmail-run/Makefile +++ b/mail/qmail-run/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.75 2020/05/19 19:45:58 schmonz Exp $ +# $NetBSD: Makefile,v 1.76 2020/10/05 12:17:20 schmonz Exp $ # -DISTNAME= qmail-run-20200519 +DISTNAME= qmail-run-20201005 CATEGORIES= mail MASTER_SITES= # empty DISTFILES= # empty diff --git a/mail/qmail-run/files/qmail-qread-client.sh b/mail/qmail-run/files/qmail-qread-client.sh index 307f47e9d4f..18c52a736e5 100644 --- a/mail/qmail-run/files/qmail-qread-client.sh +++ b/mail/qmail-run/files/qmail-qread-client.sh @@ -1,6 +1,6 @@ #!@SH@ # -# $NetBSD: qmail-qread-client.sh,v 1.5 2017/04/11 14:04:37 schmonz Exp $ +# $NetBSD: qmail-qread-client.sh,v 1.6 2020/10/05 12:17:20 schmonz Exp $ # # @PKGNAME@ client program to allow local non-root users to see # the queue. Requires that the corresponding server program be running. @@ -9,10 +9,15 @@ if [ -f /etc/rc.subr ]; then . /etc/rc.subr - load_rc_config qmailqread fi +# User-settable rc.conf variables and their default values +# (shared with the qmailqread service): : ${qmailqread_tcphost:="127.0.0.1"} : ${qmailqread_tcpport:="20025"} +if [ -f /etc/rc.subr ]; then + load_rc_config qmailqread +fi + exec @PREFIX@/bin/tcpclient -RHl0 -- ${qmailqread_tcphost} ${qmailqread_tcpport} @SH@ -c 'exec @CAT@ <&6' diff --git a/mail/qmail-run/files/qmail.sh b/mail/qmail-run/files/qmail.sh index 2bbc9a08c99..fa54f320402 100644 --- a/mail/qmail-run/files/qmail.sh +++ b/mail/qmail-run/files/qmail.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: qmail.sh,v 1.9 2018/12/30 19:09:05 schmonz Exp $ +# $NetBSD: qmail.sh,v 1.10 2020/10/05 12:17:20 schmonz Exp $ # # @PKGNAME@ master script for administrators to control qmail # services. Usage resembles the qmailctl script from "Life with qmail". @@ -36,7 +36,9 @@ qmailrcd() { for service in "$@"; do if [ -f /etc/rc.subr ]; then load_rc_config $service - checkyesno $service && $rcd_dir/${service} $rc_arg + if checkyesno $service; then + $rcd_dir/${service} $rc_arg + fi else $rcd_dir/${service} $rc_arg fi |