svn commit: r291260 - head/crypto/openssh

[Dag-Erling Smørgrav]

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