From owner-svn-src-head@freebsd.org  Tue Nov 24 16:06:16 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 A838EA36E0B;
 Tue, 24 Nov 2015 16:06:16 +0000 (UTC) (envelope-from des@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 7178F1AEA;
 Tue, 24 Nov 2015 16:06:16 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAOG6FFE092523;
 Tue, 24 Nov 2015 16:06:15 GMT (envelope-from des@FreeBSD.org)
Received: (from des@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAOG6F51092521;
 Tue, 24 Nov 2015 16:06:15 GMT (envelope-from des@FreeBSD.org)
Message-Id: <201511241606.tAOG6F51092521@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org
 using -f
From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= <des@FreeBSD.org>
Date: Tue, 24 Nov 2015 16:06:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r291260 - head/crypto/openssh
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.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2015 16:06:16 -0000

Author: des
Date: Tue Nov 24 16:06:15 2015
New Revision: 291260
URL: https://svnweb.freebsd.org/changeset/base/291260

Log:
  Remove description of the now-defunct NoneEnabled option.

Modified:
  head/crypto/openssh/session.c
  head/crypto/openssh/sshd_config

Modified: head/crypto/openssh/session.c
==============================================================================
--- head/crypto/openssh/session.c	Tue Nov 24 14:25:40 2015	(r291259)
+++ head/crypto/openssh/session.c	Tue Nov 24 16:06:15 2015	(r291260)
@@ -1432,7 +1432,8 @@ static void
 do_nologin(struct passwd *pw)
 {
 	FILE *f = NULL;
-	char buf[1024], *nl, *def_nl = _PATH_NOLOGIN;
+	char buf[1024], *def_nl = _PATH_NOLOGIN;
+	const char *nl;
 	struct stat sb;
 
 #ifdef HAVE_LOGIN_CAP

Modified: head/crypto/openssh/sshd_config
==============================================================================
--- head/crypto/openssh/sshd_config	Tue Nov 24 14:25:40 2015	(r291259)
+++ head/crypto/openssh/sshd_config	Tue Nov 24 16:06:15 2015	(r291260)
@@ -137,9 +137,6 @@ Subsystem	sftp	/usr/libexec/sftp-server
 # TCP receive socket buffer polling for HPN.  Disable on non autotuning kernels.
 #TcpRcvBufPoll yes
 
-# Allow the use of the NONE cipher.
-#NoneEnabled no
-
 # Example of overriding settings on a per-user basis
 #Match User anoncvs
 #	X11Forwarding no