From owner-svn-src-all@FreeBSD.ORG  Thu May  2 21:51:57 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 9EB695A2;
 Thu,  2 May 2013 21:51:57 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8F763171D;
 Thu,  2 May 2013 21:51:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r42Lpvhs043435;
 Thu, 2 May 2013 21:51:57 GMT (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r42LpvtB043434;
 Thu, 2 May 2013 21:51:57 GMT (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201305022151.r42LpvtB043434@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 2 May 2013 21:51:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r250196 - stable/8/etc/rc.d
X-SVN-Group: stable-8
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.14
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 May 2013 21:51:57 -0000

Author: bdrewery (ports committer)
Date: Thu May  2 21:51:57 2013
New Revision: 250196
URL: http://svnweb.freebsd.org/changeset/base/250196

Log:
  MFC r249489,249555
  
    Run configtest before restarting so that the system is not
    left without a running sshd.
  
    Also call configtest before reload to ensure working config.

Modified:
  stable/8/etc/rc.d/sshd
Directory Properties:
  stable/8/etc/   (props changed)

Modified: stable/8/etc/rc.d/sshd
==============================================================================
--- stable/8/etc/rc.d/sshd	Thu May  2 21:49:43 2013	(r250195)
+++ stable/8/etc/rc.d/sshd	Thu May  2 21:51:57 2013	(r250196)
@@ -14,6 +14,8 @@ rcvar="sshd_enable"
 command="/usr/sbin/${name}"
 keygen_cmd="sshd_keygen"
 start_precmd="sshd_precmd"
+reload_precmd="sshd_configtest"
+restart_precmd="sshd_configtest"
 configtest_cmd="sshd_configtest"
 pidfile="/var/run/${name}.pid"
 extra_commands="configtest keygen reload"