Fix "reload" and "hup" (broken in 20170729).

For all services where we set procname, prefix "nb". This makes it even
harder for observers to fail to notice that this isn't a Life with qmail
install, and happens to match the log tags already being applied.

Bump version.

7 files changed, 27 insertions, 27 deletions

diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile
index 51a44c7e80b..2ce249b9c2d 100644
--- a/mail/qmail-run/Makefile
+++ b/mail/qmail-run/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2017/08/04 06:35:28 schmonz Exp $
+# $NetBSD: Makefile,v 1.43 2017/08/05 03:03:17 schmonz Exp $
 #
 
-DISTNAME=		qmail-run-20170804
+DISTNAME=		qmail-run-20170805
 CATEGORIES=		mail
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/mail/qmail-run/files/qmail.sh b/mail/qmail-run/files/qmail.sh
index a0ae010f0d5..d3cfa336b4f 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.6 2017/07/30 03:05:59 schmonz Exp $
+# $NetBSD: qmail.sh,v 1.7 2017/08/05 03:03:17 schmonz Exp $
 #
 # @PKGNAME@ master script for administrators to control qmail
 # services. Usage resembles the qmailctl script from "Life with qmail".
@@ -75,7 +75,7 @@ name="qmail"
 start_cmd="forward_commands"
 stop_cmd="reverse_commands"
 doqueue_cmd="qmailrcd qmailsend"; alrm_cmd=${doqueue_cmd}; flush_cmd=${doqueue_cmd}
-reload_cmd="qmailrcd send"; hup_cmd=${reload_cmd}
+reload_cmd="qmailrcd qmailsend"; hup_cmd=${reload_cmd}
 status_cmd="forward_commands"; stat_cmd=${status_cmd}
 pause_cmd="reverse_commands"
 cont_cmd="forward_commands"
diff --git a/mail/qmail-run/files/qmailofmipd.sh b/mail/qmail-run/files/qmailofmipd.sh
index 4182ae5857b..ce65176b2d0 100644
--- a/mail/qmail-run/files/qmailofmipd.sh
+++ b/mail/qmail-run/files/qmailofmipd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailofmipd.sh,v 1.7 2017/07/21 04:08:15 schmonz Exp $
+# $NetBSD: qmailofmipd.sh,v 1.8 2017/08/05 03:03:17 schmonz Exp $
 #
 # @PKGNAME@ script to control ofmipd (SMTP submission service).
 #
@@ -22,7 +22,7 @@ name="qmailofmipd"
 : ${qmailofmipd_ofmipdcmd:="@PREFIX@/bin/ofmipd"}
 : ${qmailofmipd_postofmipd:=""}
 : ${qmailofmipd_log:="YES"}
-: ${qmailofmipd_logcmd:="logger -t nb${name} -p mail.info"}
+: ${qmailofmipd_logcmd:="logger -t ${procname} -p mail.info"}
 : ${qmailofmipd_nologcmd:="@PREFIX@/bin/multilog -*"}
 
 if [ -f /etc/rc.subr ]; then
@@ -34,7 +34,7 @@ required_files="@PKG_SYSCONFDIR@/control/concurrencyofmip"
 required_files="${required_files} @PKG_SYSCONFDIR@/tcp.ofmip.cdb"
 required_files="${required_files} @PKG_SYSCONFDIR@/control/rcpthosts"
 command="${qmailofmipd_tcpserver}"
-procname=${name}
+procname=nb${name}
 start_precmd="qmailofmipd_precmd"
 extra_commands="stat pause cont cdb reload"
 stat_cmd="qmailofmipd_stat"
@@ -50,10 +50,10 @@ qmailofmipd_precmd()
 	fi
 	# tcpserver(1) is akin to inetd(8), but runs one service per process.
 	# We want to signal only the tcpserver process responsible for this
-	# service. Use argv0(1) to set procname to "qmailofmipd".
+	# service. Use argv0(1) to set procname to "nbqmailofmipd".
 	command="@PREFIX@/bin/pgrphack @SETENV@ - ${qmailofmipd_postenv}
 @PREFIX@/bin/softlimit -m ${qmailofmipd_datalimit} ${qmailofmipd_pretcpserver}
-@PREFIX@/bin/argv0 ${qmailofmipd_tcpserver} ${name}
+@PREFIX@/bin/argv0 ${qmailofmipd_tcpserver} ${procname}
 ${qmailofmipd_tcpflags} -x @PKG_SYSCONFDIR@/tcp.ofmip.cdb
 -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencyofmip`
 -u `@ID@ -u @QMAIL_DAEMON_USER@` -g `@ID@ -g @QMAIL_DAEMON_USER@`
diff --git a/mail/qmail-run/files/qmailpop3d.sh b/mail/qmail-run/files/qmailpop3d.sh
index b7245f310b3..5fb352f53b0 100644
--- a/mail/qmail-run/files/qmailpop3d.sh
+++ b/mail/qmail-run/files/qmailpop3d.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailpop3d.sh,v 1.15 2017/06/23 15:49:03 schmonz Exp $
+# $NetBSD: qmailpop3d.sh,v 1.16 2017/08/05 03:03:17 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-pop3d (POP3 server for Maildirs).
 #
@@ -22,7 +22,7 @@ name="qmailpop3d"
 : ${qmailpop3d_checkpassword:="@PREFIX@/bin/checkpassword"}
 : ${qmailpop3d_maildirname:="Maildir"}
 : ${qmailpop3d_log:="YES"}
-: ${qmailpop3d_logcmd:="logger -t nb${name} -p mail.info"}
+: ${qmailpop3d_logcmd:="logger -t ${procname} -p mail.info"}
 : ${qmailpop3d_nologcmd:="@PREFIX@/bin/multilog -*"}
 
 if [ -f /etc/rc.subr ]; then
@@ -34,7 +34,7 @@ required_files="@PKG_SYSCONFDIR@/control/me"
 required_files="${required_files} @PKG_SYSCONFDIR@/control/concurrencypop3"
 required_files="${required_files} @PKG_SYSCONFDIR@/tcp.pop3.cdb"
 command="${qmailpop3d_tcpserver}"
-procname=${name}
+procname=nb${name}
 start_precmd="qmailpop3d_precmd"
 extra_commands="stat pause cont cdb reload"
 stat_cmd="qmailpop3d_stat"
@@ -50,10 +50,10 @@ qmailpop3d_precmd()
 	fi
 	# tcpserver(1) is akin to inetd(8), but runs one service per process.
 	# We want to signal only the tcpserver process responsible for this
-	# service. Use argv0(1) to set procname to "qmailpop3d".
+	# service. Use argv0(1) to set procname to "nbqmailpop3d".
 	command="@PREFIX@/bin/pgrphack @SETENV@ - ${qmailpop3d_postenv}
 @PREFIX@/bin/softlimit -m ${qmailpop3d_datalimit} ${qmailpop3d_pretcpserver}
-@PREFIX@/bin/argv0 ${qmailpop3d_tcpserver} ${name}
+@PREFIX@/bin/argv0 ${qmailpop3d_tcpserver} ${procname}
 ${qmailpop3d_tcpflags} -x @PKG_SYSCONFDIR@/tcp.pop3.cdb
 -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencypop3`
 ${qmailpop3d_tcphost} ${qmailpop3d_tcpport} @PREFIX@/bin/qmail-popup
diff --git a/mail/qmail-run/files/qmailqread.sh b/mail/qmail-run/files/qmailqread.sh
index 1f3ab95c295..d5e880c4f29 100644
--- a/mail/qmail-run/files/qmailqread.sh
+++ b/mail/qmail-run/files/qmailqread.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailqread.sh,v 1.12 2017/07/30 03:05:59 schmonz Exp $
+# $NetBSD: qmailqread.sh,v 1.13 2017/08/05 03:03:17 schmonz Exp $
 #
 # @PKGNAME@ script to control a service providing local non-root
 # users access to see the queue. Adapted from a script by Steinar Haug.
@@ -18,7 +18,7 @@ name="qmailqread"
 : ${qmailqread_tcpport:="20025"}
 : ${qmailqread_tcpserver:="@PREFIX@/bin/tcpserver"}
 : ${qmailqread_log:="YES"}
-: ${qmailqread_logcmd:="logger -t nb${name} -p mail.info"}
+: ${qmailqread_logcmd:="logger -t ${procname} -p mail.info"}
 : ${qmailqread_nologcmd:="@PREFIX@/bin/multilog -*"}
 
 if [ -f /etc/rc.subr ]; then
@@ -27,7 +27,7 @@ fi
 
 rcvar=${name}
 command="${qmailqread_tcpserver}"
-procname=${name}
+procname=nb${name}
 start_precmd="qmailqread_precmd"
 extra_commands="stat pause cont"
 stat_cmd="qmailqread_stat"
@@ -41,9 +41,9 @@ qmailqread_precmd()
 	fi
 	# tcpserver(1) is akin to inetd(8), but runs one service per process.
 	# We want to signal only the tcpserver process responsible for this
-	# service. Use argv0(1) to set procname to "qmailqread".
+	# service. Use argv0(1) to set procname to "nbqmailqread".
 	command="@PREFIX@/bin/pgrphack @SETENV@ - ${qmailqread_postenv}
-@PREFIX@/bin/argv0 ${qmailqread_tcpserver} ${name}
+@PREFIX@/bin/argv0 ${qmailqread_tcpserver} ${procname}
 ${qmailqread_tcpflags}
 -u `@ID@ -u @QMAIL_SEND_USER@` -g `@ID@ -g @QMAIL_SEND_USER@`
 ${qmailqread_tcphost} ${qmailqread_tcpport}
diff --git a/mail/qmail-run/files/qmailsend.sh b/mail/qmail-run/files/qmailsend.sh
index d2e2a1bf56b..cb8ccbabdc3 100644
--- a/mail/qmail-run/files/qmailsend.sh
+++ b/mail/qmail-run/files/qmailsend.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailsend.sh,v 1.11 2017/08/04 06:35:28 schmonz Exp $
+# $NetBSD: qmailsend.sh,v 1.12 2017/08/05 03:03:17 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-send (local and outgoing mail).
 #
@@ -42,11 +42,11 @@ hup_cmd="qmailsend_hup"
 
 qmailsend_prestart()
 {
-	# qmail-start(8) starts the various qmail processes, then exits.
-	# qmail-send(8) is the process we want to signal later.
 	if [ -f /etc/rc.subr ] && ! checkyesno qmailsend_log; then
 		qmailsend_logcmd=${qmailsend_nologcmd}
 	fi
+	# qmail-start(8) starts the various qmail processes, then execs
+	# qmail-send(8). That's the process we want to signal later.
 	command="@PREFIX@/bin/pgrphack @SETENV@ - ${qmailsend_postenv}
 qmail-start '$qmailsend_defaultdelivery'
 ${qmailsend_logcmd}"
diff --git a/mail/qmail-run/files/qmailsmtpd.sh b/mail/qmail-run/files/qmailsmtpd.sh
index 82bb233be21..ab3d97d5265 100644
--- a/mail/qmail-run/files/qmailsmtpd.sh
+++ b/mail/qmail-run/files/qmailsmtpd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailsmtpd.sh,v 1.15 2017/06/23 15:49:03 schmonz Exp $
+# $NetBSD: qmailsmtpd.sh,v 1.16 2017/08/05 03:03:17 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-smtpd (SMTP service).
 #
@@ -22,7 +22,7 @@ name="qmailsmtpd"
 : ${qmailsmtpd_smtpdcmd:="@PREFIX@/bin/qmail-smtpd"}
 : ${qmailsmtpd_postsmtpd:=""}
 : ${qmailsmtpd_log:="YES"}
-: ${qmailsmtpd_logcmd:="logger -t nb${name} -p mail.info"}
+: ${qmailsmtpd_logcmd:="logger -t ${procname} -p mail.info"}
 : ${qmailsmtpd_nologcmd:="@PREFIX@/bin/multilog -*"}
 
 if [ -f /etc/rc.subr ]; then
@@ -34,7 +34,7 @@ required_files="@PKG_SYSCONFDIR@/control/concurrencyincoming"
 required_files="${required_files} @PKG_SYSCONFDIR@/tcp.smtp.cdb"
 required_files="${required_files} @PKG_SYSCONFDIR@/control/rcpthosts"
 command="${qmailsmtpd_tcpserver}"
-procname=${name}
+procname=nb${name}
 start_precmd="qmailsmtpd_precmd"
 extra_commands="stat pause cont cdb reload"
 stat_cmd="qmailsmtpd_stat"
@@ -50,10 +50,10 @@ qmailsmtpd_precmd()
 	fi
 	# tcpserver(1) is akin to inetd(8), but runs one service per process.
 	# We want to signal only the tcpserver process responsible for this
-	# service. Use argv0(1) to set procname to "qmailsmtpd".
+	# service. Use argv0(1) to set procname to "nbqmailsmtpd".
 	command="@PREFIX@/bin/pgrphack @SETENV@ - ${qmailsmtpd_postenv}
 @PREFIX@/bin/softlimit -m ${qmailsmtpd_datalimit} ${qmailsmtpd_pretcpserver}
-@PREFIX@/bin/argv0 ${qmailsmtpd_tcpserver} ${name}
+@PREFIX@/bin/argv0 ${qmailsmtpd_tcpserver} ${procname}
 ${qmailsmtpd_tcpflags} -x @PKG_SYSCONFDIR@/tcp.smtp.cdb
 -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencyincoming`
 -u `@ID@ -u @QMAIL_DAEMON_USER@` -g `@ID@ -g @QMAIL_DAEMON_USER@`