From owner-svn-src-head@FreeBSD.ORG  Fri Jun 21 17:23:20 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 42B97510;
 Fri, 21 Jun 2013 17:23:20 +0000 (UTC)
 (envelope-from delphij@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 365BF1B4B;
 Fri, 21 Jun 2013 17:23:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5LHNKwj066288;
 Fri, 21 Jun 2013 17:23:20 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5LHNKWR066287;
 Fri, 21 Jun 2013 17:23:20 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201306211723.r5LHNKWR066287@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 21 Jun 2013 17:23:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252062 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Jun 2013 17:23:20 -0000

Author: delphij
Date: Fri Jun 21 17:23:19 2013
New Revision: 252062
URL: http://svnweb.freebsd.org/changeset/base/252062

Log:
  Call sshd_precmd instead of sshd_configtest when the operator
  requests reload or restart, which, in addition of testing the
  configuration, will also generate host keys when they are not
  present (previous behavior).
  
  Obtained from:	FreeNAS
  Ok'ed by:	bdrewery, des
  MFC after:	1 week

Modified:
  head/etc/rc.d/sshd

Modified: head/etc/rc.d/sshd
==============================================================================
--- head/etc/rc.d/sshd	Fri Jun 21 15:55:03 2013	(r252061)
+++ head/etc/rc.d/sshd	Fri Jun 21 17:23:19 2013	(r252062)
@@ -14,8 +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"
+reload_precmd="sshd_precmd"
+restart_precmd="sshd_precmd"
 configtest_cmd="sshd_configtest"
 pidfile="/var/run/${name}.pid"
 extra_commands="configtest keygen reload"