From owner-svn-src-all@freebsd.org  Mon Jun 12 01:26:37 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8BFE0BF1239;
 Mon, 12 Jun 2017 01:26:37 +0000 (UTC)
 (envelope-from gshapiro@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4E1597D075;
 Mon, 12 Jun 2017 01:26:37 +0000 (UTC)
 (envelope-from gshapiro@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5C1QapL093556;
 Mon, 12 Jun 2017 01:26:36 GMT (envelope-from gshapiro@FreeBSD.org)
Received: (from gshapiro@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5C1QaqZ093555;
 Mon, 12 Jun 2017 01:26:36 GMT (envelope-from gshapiro@FreeBSD.org)
Message-Id: <201706120126.v5C1QaqZ093555@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gshapiro set sender to
 gshapiro@FreeBSD.org using -f
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Mon, 12 Jun 2017 01:26:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r319843 - head/etc/rc.d
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jun 2017 01:26:37 -0000

Author: gshapiro
Date: Mon Jun 12 01:26:36 2017
New Revision: 319843
URL: https://svnweb.freebsd.org/changeset/base/319843

Log:
  Fix 'restart' action: rc.subr only expects to restart one service, not two.
  
  PR:		217393
  Reported by:	Martin Simmons
  MFC after:	1 week

Modified:
  head/etc/rc.d/sendmail

Modified: head/etc/rc.d/sendmail
==============================================================================
--- head/etc/rc.d/sendmail	Mon Jun 12 00:43:14 2017	(r319842)
+++ head/etc/rc.d/sendmail	Mon Jun 12 01:26:36 2017	(r319843)
@@ -206,12 +206,14 @@ required_files=
 if checkyesno sendmail_submit_enable; then
 	name="sendmail_submit"
 	rcvar="sendmail_submit_enable"
+	_rc_restart_done=false
 	run_rc_command "$1"
 fi
 
 if checkyesno sendmail_outbound_enable; then
 	name="sendmail_outbound"
 	rcvar="sendmail_outbound_enable"
+	_rc_restart_done=false
 	run_rc_command "$1"
 fi
 
@@ -219,4 +221,5 @@ name="sendmail_msp_queue"
 rcvar="sendmail_msp_queue_enable"
 pidfile="${sendmail_msp_queue_pidfile:-/var/spool/clientmqueue/sm-client.pid}"
 required_files="/etc/mail/submit.cf"
+_rc_restart_done=false
 run_rc_command "$1"