Skip to content

Commit

Permalink
If any of our several rcvars aren't YES, that's fine: don't exit
Browse files Browse the repository at this point in the history
nonzero. Bump version.

While here, document in qmail-qread-client that its rc.conf vars are
shared with the qmailqread service.
  • Loading branch information
schmonz committed Oct 5, 2020
1 parent 659384d commit 4a29a0f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
4 changes: 2 additions & 2 deletions 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
Expand Down
9 changes: 7 additions & 2 deletions 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.
Expand All @@ -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'
6 changes: 4 additions & 2 deletions 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".
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 4a29a0f

Please sign in to comment.